Commit Graph

11 Commits

Author SHA1 Message Date
Martin Araneda e62acd3ab1 final changes to music 2022-09-01 23:22:10 -04:00
Chris Cromer 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
Martin Araneda 7236428157 coin and bgm added, game over music still not done 2022-09-01 15:55:02 -04:00
Chris Cromer 5d611f790d
make the restart button send the game started event 2022-09-01 11:30:58 -04:00
Chris Cromer bc82d3d08c
fix header guards 2022-08-31 00:05:08 -04:00
Chris Cromer 39173cef21
cleanup code 2022-08-28 01:08:04 -04:00
Martin Araneda 3bcbde8161 Game over screen finished 2022-08-27 22:34:18 -04:00
Martin Araneda a27f968297 add gameover 2022-08-27 18:14:21 -04:00
Chris Cromer b74a8ce1aa
fix function name and pointer usage 2022-08-26 13:51:19 -04:00
Chris Cromer ff600cd761
fix spacing 2022-08-26 13:48:59 -04:00
Martin Araneda 64102a992a GameOverScreen .h/.cpp made. Godot scene completed 2022-08-12 21:50:48 -04:00