Commit Graph

8 Commits

Author SHA1 Message Date
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 eb14adbb0e
add the godot namespace to the calls so it is more clear where the method resides 2022-08-31 00:36:01 -04:00
Chris Cromer 39173cef21
cleanup code 2022-08-28 01:08:04 -04:00
Martin Araneda 705ed4e897 Use event bus for coins 2022-08-27 18:32:33 -04:00
Martin Araneda b9ff12dab3 Finished coin counter 2022-07-16 18:36:38 -04:00
Martin Araneda b25e1f040c minor changes 2022-07-15 23:04:06 -04:00
Martin Araneda 876206c39d Added two states, collected and not collected 2022-06-11 00:26:11 -04:00