Chris Cromer f8f1210e61 Merge branch 'develop' into feature/enemies ... # Conflicts: # godot/characters/player/Player.tscn		2022-07-27 00:08:25 -04:00
..
sprites	prototype	2022-04-05 14:51:59 -04:00
states	add state machine and have player use it	2022-04-11 13:30:51 -04:00
Player.gdns	add state machine and have player use it	2022-04-11 13:30:51 -04:00
Player.tscn	Merge branch 'develop' into feature/enemies	2022-07-27 00:08:25 -04:00