Chara1236 4d58cece36 Merge remote-tracking branch 'origin/master' ... # Conflicts: # src/GamePanel.java # src/Player.java # src/Tile.java		2022-06-05 12:01:21 -04:00
doc	Added parallax, started documentation	2022-06-03 13:44:38 -04:00
img	Add NPCs	2022-06-03 17:33:21 -04:00
saves	Finished Collision Physics	2022-06-05 11:53:03 -04:00
sound	Sound Class and some Tile Ids I guess	2022-06-03 13:50:13 -04:00
src	Merge remote-tracking branch 'origin/master'	2022-06-05 12:01:21 -04:00
.gitignore	Clean up git repo	2022-06-01 13:51:35 -04:00
final.iml	First commit	2022-05-30 14:36:18 -04:00