James/TowerDefense
2
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

upgrade: godot 4.5 #6

Open
Varylios wants to merge 4 commits from update/godot-4.5-feature into main
pull from: update/godot-4.5-feature
merge into: James:main
Conversation 0 Commits 4 Files changed 38 +415 -286
Varylios commented 2025-09-16 22:14:44 +02:00
Collaborator
Copy link
No description provided.
Varylios added 1 commit 2025-09-16 22:14:45 +02:00
Varylios force-pushed update/godot-4.5-feature from 8eb87f9c79 to 579fc26423 2025-09-16 22:53:44 +02:00 Compare
Varylios added 1 commit 2025-09-20 19:59:04 +02:00 
- add hitscan
 - add camera arrow key move
Varylios added 1 commit 2025-09-21 00:32:18 +02:00
Varylios added 1 commit 2025-09-21 13:08:23 +02:00
This pull request has changes conflicting with the target branch.
  • Levels/Map 1/level_1.tres
  • Projectiles/Scenes/projectile-Victoria.tscn
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin update/godot-4.5-feature:update/godot-4.5-feature
git checkout update/godot-4.5-feature

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 update/godot-4.5-feature
git checkout update/godot-4.5-feature
git rebase main
git checkout main
git merge --ff-only update/godot-4.5-feature
git checkout update/godot-4.5-feature
git rebase main
git checkout main
git merge --no-ff update/godot-4.5-feature
git checkout main
git merge --squash update/godot-4.5-feature
git checkout main
git merge --ff-only update/godot-4.5-feature
git checkout main
git merge update/godot-4.5-feature
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
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: James/TowerDefense#6
No description provided.
Delete branch "update/godot-4.5-feature"

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?