silvana/yuno
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add(assets): tiled maps support. #2

Open
silvana wants to merge 2 commits from feat/tilemap into main
pull from: feat/tilemap
merge into: silvana:main
Conversation 0 Commits 2 Files changed 13 +1026 -40
silvana commented 2024-08-04 11:45:53 +00:00
Owner
Copy link
No description provided.
silvana added 1 commit 2024-08-04 11:45:53 +00:00
Add(assets): tiled maps support.
Some checks failed
ci/woodpecker/pr/quality Pipeline failed
Details
809b1d7c5c
silvana self-assigned this 2024-08-04 11:45:56 +00:00
silvana force-pushed feat/tilemap from 809b1d7c5c to c4adc341c2 2024-08-04 11:54:22 +00:00 Compare
silvana force-pushed feat/tilemap from c4adc341c2 to 801ae72044 2024-08-04 12:16:46 +00:00 Compare
silvana force-pushed feat/tilemap from 801ae72044 to 38cb6b1563 2024-08-04 12:18:51 +00:00 Compare
silvana force-pushed feat/tilemap from 38cb6b1563 to 80e33fa7e6 2024-08-04 12:20:34 +00:00 Compare
silvana added 1 commit 2024-08-04 14:07:08 +00:00
Add(debug): debug ui.
All checks were successful
ci/woodpecker/pr/quality Pipeline was successful
Details
ab6cbbf303
All checks were successful
ci/woodpecker/pr/quality Pipeline was successful
Details
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/tilemap:feat/tilemap
git checkout feat/tilemap

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff feat/tilemap
git checkout feat/tilemap
git rebase main
git checkout main
git merge --ff-only feat/tilemap
git checkout feat/tilemap
git rebase main
git checkout main
git merge --no-ff feat/tilemap
git checkout main
git merge --squash feat/tilemap
git checkout main
git merge --ff-only feat/tilemap
git checkout main
git merge feat/tilemap
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
silvana
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: silvana/yuno#2
No description provided.
Delete branch "feat/tilemap"

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?