2121578
/
gai-ca2
3
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Status Bars #5

Closed
3002257 wants to merge 43 commits from main into StatusBars
pull from: main
merge into: 2121578:StatusBars
Conversation 0 Commits 43 Files Changed 68
3002257 commented 2025-01-11 11:11:02 +01:00
Collaborator
There is no content yet.
3002257 added 2 commits 2025-01-11 11:11:02 +01:00
2121578 changed title from main to Status Bars 2025-01-11 11:11:22 +01:00
3002257 added 1 commit 2025-01-11 11:11:50 +01:00
2121578 added 1 commit 2025-01-11 11:13:12 +01:00
2121578 added 1 commit 2025-01-11 11:14:57 +01:00
2021587 added 1 commit 2025-01-11 11:31:00 +01:00
2021587 added 1 commit 2025-01-11 11:38:11 +01:00
2021587 added 1 commit 2025-01-11 11:40:09 +01:00
3002257 added 2 commits 2025-01-11 13:05:26 +01:00
2121578 added 3 commits 2025-01-11 13:15:33 +01:00
5c0fc2beed Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	project/scripts/global/GameManager.gd
#	project/scripts/player/PlayerManager.gd
2121578 added 1 commit 2025-01-11 13:44:00 +01:00
2121578 added 1 commit 2025-01-11 14:05:48 +01:00
2121578 added 1 commit 2025-01-11 14:34:34 +01:00
2021587 added 1 commit 2025-01-11 16:07:38 +01:00
2121578 added 8 commits 2025-01-11 17:43:17 +01:00
9446c10556 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	project/assets/tilemap/tileset.tres
#	project/main-scenes/island.tscn
238af1cc83 Merge branch 'working-map' 
# Conflicts:
#	project/main-scenes/island.tscn
2121578 added 1 commit 2025-01-11 19:05:09 +01:00
2121578 added 1 commit 2025-01-12 14:37:44 +01:00
2121578 added 1 commit 2025-01-12 15:04:20 +01:00
2121578 added 1 commit 2025-01-12 16:28:38 +01:00
2121578 added 1 commit 2025-01-12 17:45:25 +01:00
2121578 added 4 commits 2025-01-13 18:18:09 +01:00
2121578 added 1 commit 2025-01-13 18:57:08 +01:00
2121578 added 1 commit 2025-01-13 19:30:48 +01:00
2121578 added 1 commit 2025-01-13 20:12:43 +01:00
2121578 added 1 commit 2025-01-14 09:43:54 +01:00
2121578 added 1 commit 2025-01-14 10:13:37 +01:00
2121578 added 1 commit 2025-01-14 11:35:18 +01:00
2121578 added 1 commit 2025-01-14 12:01:12 +01:00
2121578 added 1 commit 2025-01-14 12:11:47 +01:00
2121578 added 1 commit 2025-01-14 19:21:10 +01:00
2121578 closed this pull request 2025-01-14 19:24:53 +01: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
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
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: 2121578/gai-ca2#5
There is no content yet.
Delete Branch "main"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?