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
..
states	cleanup c++ code	2022-08-26 19:27:57 -04:00
Player.cpp	Merge branch 'develop' into feature/cleanup	2022-08-28 00:38:08 -04:00
Player.h	cleanup c++ code	2022-08-26 19:27:57 -04:00