Chris Cromer a9f26a8408 Merge branch 'develop' into feature/Coin ...

# Conflicts:
#	godot/Main.tscn
#	godot/project.godot

2022-08-26 13:54:25 -04:00

..

addons/vnen.tiled_importer

update tiled importer and fix camera bounds to work with it

2022-07-06 18:03:25 -04:00

assets

add sounds and adjust music

2022-07-26 23:14:21 -04:00

characters

add blightwing's behavior

2022-08-04 00:59:10 -04:00

collectables/coin

Added two states, collected and not collected

2022-06-11 00:26:11 -04:00

gdnative

add state machine and have player use it

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

goal

changes to coinHUD

2022-08-01 15:05:09 -04:00

GUI

GameOverScreen .h/.cpp made. Godot scene completed

2022-08-12 21:50:48 -04:00

hud

ignore delta since we don't use it

2022-08-26 13:48:39 -04:00

levels

Merge branch 'develop' into feature/Coin

2022-08-26 13:54:25 -04:00

monitor

fix level not loading when monitor is disabled

2022-08-26 10:51:16 -04:00

parallax

update maps and tilesets

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

shaders/crt

add CRT shader

2022-08-03 21:38:13 -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

CameraLimit.gdns

add camera limit script

2022-04-20 11:48:11 -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

Merge branch 'develop' into feature/Coin

2022-08-26 13:54:25 -04:00

project.godot

Merge branch 'develop' into feature/Coin

2022-08-26 13:54:25 -04:00