develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
Owner
No description provided.
cromer added 46 commits 2022-09-02 00:37:10 -04:00
e981295e5f
fix windows build
gnu++17 doesn't support inline variables but c++17 does
c002528d49
Merge branch 'develop' into feature/Prototype_R_LEVEL
# Conflicts:
#	godot/Main.tscn
#	godot/gui/GameOver.tscn
#	src/gui/game_over/GameOverScreen.cpp
346af5dd44 Merge branch 'develop' into feature/Prototype_R_LEVEL
# Conflicts:
#	godot/levels/Prototype.tscn
cromer added 1 commit 2022-09-02 00:37:23 -04:00
cromer merged commit 74d081abbf into master 2022-09-02 00:37:34 -04:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
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#50
No description provided.