Chris Cromer f8f1210e61 Merge branch 'develop' into feature/enemies ... # Conflicts: # godot/characters/player/Player.tscn		2022-07-27 00:08:25 -04:00
..
states	add sounds and adjust music	2022-07-26 23:14:21 -04:00
Player.cpp	change dot vector check to be greater than 0	2022-07-27 00:03:59 -04:00
Player.h	add comment to _on_player_touched	2022-07-21 20:54:06 -04:00