Chris Cromer 662a476ef8 Merge branch 'develop' into feature/Level_2 ... # Conflicts: # godot/juego.tiled-session # godot/levels/Prototype.tscn # godot/tilesets/tiles.tsx		2022-04-21 13:25:29 -04:00
..
Level2.tmx	update level2	2022-04-19 23:48:49 -04:00
Level2.tmx.import	update level2	2022-04-19 23:48:49 -04:00
Level2.tscn	add camera limit script	2022-04-20 11:48:11 -04:00
Prototype.tmx	update maps and tilesets	2022-04-16 14:21:15 -04:00
Prototype.tmx.import	update maps and tilesets	2022-04-16 14:21:15 -04:00
Prototype.tscn	add camera limit script	2022-04-20 11:48:11 -04:00
level02.tmx	level 3 expansion	2022-04-15 16:15:23 -04:00
level02.tmx.import	new level 3	2022-04-12 14:35:08 -04:00