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

develop #34

Merged
cromer merged 36 commits from develop into master 2022-08-28 01:13:46 -04:00
Conversation 0 Commits 36 Files Changed 49 +1627 -538
cromer commented 2022-08-28 01:13:07 -04:00
Owner
Copy Link
No description provided.
cromer added 35 commits 2022-08-28 01:13:07 -04:00
2be22ceb68 Merge branch 'develop' into feature/Coin 
# Conflicts:
#	godot/Main.tscn
a9f26a8408
Merge branch 'develop' into feature/Coin 
# Conflicts:
#	godot/Main.tscn
#	godot/project.godot
156d3ddcae
Merge branch 'develop' into feature/cleanup 
# Conflicts:
#	src/godot.cpp
#	src/player/Player.cpp
cromer added 1 commit 2022-08-28 01:13:19 -04:00
cromer merged commit 816da5060b into master 2022-08-28 01:13:46 -04:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 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: Proyecto-Titulo/alai#34
No description provided.
Delete Branch "develop"

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?