Martin Araneda 2be22ceb68 Merge branch 'develop' into feature/Coin ... # Conflicts: # godot/Main.tscn		2022-08-01 14:17:05 -04:00
..
Level2.tmx	update level2	2022-04-19 23:48:49 -04:00
Level2.tmx.import	reimport levels with y sorting disabled	2022-04-23 15:48:25 -04:00
Level2.tscn	add level 2 music	2022-07-22 00:10:08 -04:00
MusicPlayer.gd	add level 2 music	2022-07-22 00:10:08 -04:00
Prototype.tmx	update maps and tilesets	2022-04-16 14:21:15 -04:00
Prototype.tmx.import	reimport levels with y sorting disabled	2022-04-23 15:48:25 -04:00
Prototype.tscn	fix goal state	2022-08-01 14:10:00 -04:00