Chris Cromer f8f1210e61 Merge branch 'develop' into feature/enemies ... # Conflicts: # godot/characters/player/Player.tscn		2022-07-27 00:08:25 -04:00
..
player	Merge branch 'develop' into feature/enemies	2022-07-27 00:08:25 -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	add camera limit script	2022-04-20 11:48:11 -04:00