Commit Graph

2 Commits

Author SHA1 Message Date
c002528d49
Merge branch 'develop' into feature/Prototype_R_LEVEL
# Conflicts:
#	godot/Main.tscn
#	godot/gui/GameOver.tscn
#	src/gui/game_over/GameOverScreen.cpp
2022-09-01 16:13:55 -04:00
0f94363266
refactor game over screen 2022-08-30 23:58:02 -04:00