Chris Cromer 9adf91c231 Merge branch 'develop' into feature/tilesets ...

# Conflicts:
#	godot/Main.tscn
#	godot/levels/Level2.tmx
#	godot/levels/Level2.tmx.import
#	godot/tilesets/tiles.tsx

2022-04-20 10:22:52 -04:00

..

addons/vnen.tiled_importer

add zstd support and fix a bug

2022-04-16 20:04:15 -04:00

assets

move object art into separate files

2022-04-20 00:37:59 -04:00

characters/player

update maps and tilesets

2022-04-16 20:04:15 -04:00

gdnative

add state machine and have player use it

2022-04-11 13:30:51 -04:00

levels

update level2

2022-04-19 23:48:49 -04:00

parallax

update maps and tilesets

2022-04-16 20:04:15 -04:00

state_machine

fix incorrect gdnative resource

2022-04-13 01:10:40 -04:00

tilesets

update level2

2022-04-19 23:48:49 -04:00

alai.tiled-project

rename tiled file name

2022-04-16 20:04:15 -04:00

camera_fix.gd

update maps and tilesets

2022-04-16 20:04:15 -04:00

icon.png

prototype

2022-04-05 14:51:59 -04:00

icon.png.import

reimport icon as lossless 2D pixel art

2022-04-06 22:50:07 -04:00

Main.gdns

add state machine and have player use it

2022-04-11 13:30:51 -04:00

Main.tscn

update level2

2022-04-19 23:48:49 -04:00

project.godot

update maps and tilesets

2022-04-16 20:04:15 -04:00