Martin Araneda 2be22ceb68 Merge branch 'develop' into feature/Coin ... # Conflicts: # godot/Main.tscn		2022-08-01 14:17:05 -04:00
..
coin	Finished coin counter	2022-07-16 18:36:38 -04:00
goal	fix goal state	2022-08-01 14:10:00 -04:00
player	add sounds and adjust music	2022-07-26 23:14:21 -04:00
state_machine	update comments	2022-04-22 21:56:22 -04:00
CameraLimit.cpp	update tiled importer and fix camera bounds to work with it	2022-07-06 18:03:25 -04:00
CameraLimit.h	update comments	2022-04-22 21:56:22 -04:00
Main.cpp	pause game when starting	2022-07-19 21:44:28 -04:00
Main.h	Get monitor working and communicating with backend	2022-07-19 21:44:28 -04:00
godot.cpp	Flag successfully placed on lvl, hitbox detected and working	2022-07-17 21:51:11 -04:00