Chris Cromer 156d3ddcae Merge branch 'develop' into feature/cleanup ... # Conflicts: # src/godot.cpp # src/player/Player.cpp		2022-08-28 00:38:08 -04:00
..
coin	Use event bus for coins	2022-08-27 18:32:33 -04:00
goal	changes to coinHUD	2022-08-01 15:05:09 -04:00
gui/game_over	Game over screen finished	2022-08-27 22:34:18 -04:00
player	Merge branch 'develop' into feature/cleanup	2022-08-28 00:38:08 -04:00
state_machine	cleanup c++ code	2022-08-26 19:27:57 -04:00
CameraLimit.cpp	cleanup c++ code	2022-08-26 19:27:57 -04:00
CameraLimit.h	cleanup c++ code	2022-08-26 19:27:57 -04:00
Event.cpp	Use event bus for coins	2022-08-27 18:32:33 -04:00
Event.h	add event bus	2022-08-27 18:10:36 -04:00
Main.cpp	use empty PackedScene instead of nullptr	2022-08-27 00:25:15 -04:00
Main.h	include forgotten header	2022-08-26 23:57:12 -04:00
godot.cpp	Merge branch 'develop' into feature/cleanup	2022-08-28 00:38:08 -04:00