Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/tilesets #12

Closed
cromer wants to merge 0 commits from feature/tilesets into develop
pull from: feature/tilesets
merge into: Proyecto-Titulo:develop
Conversation 0 Commits - Files Changed -
cromer commented 2022-04-20 10:15:07 -04:00
Owner
Copy Link
No description provided.
cromer added 7 commits 2022-04-20 10:15:08 -04:00
rename tiled file name 5a644d78c3
ignore tiled session files 4f4d6b0a03
add zstd support and fix a bug 9b0102ee44
update maps and tilesets a11370c784
remove object layer cdaa32ce17
make level dynamic from main dab20270be
update level2 c88a8615b2
cromer added 1 commit 2022-04-20 10:23:10 -04:00
Merge branch 'develop' into feature/tilesets 9adf91c231 
# Conflicts:
#	godot/Main.tscn
#	godot/levels/Level2.tmx
#	godot/levels/Level2.tmx.import
#	godot/tilesets/tiles.tsx
cromer closed this pull request 2022-04-20 10:27:59 -04:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ClementeRM Martin cromer
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Proyecto-Titulo/alai#12
No description provided.
Delete Branch "feature/tilesets"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?