Commit Graph

20 Commits

Author SHA1 Message Date
c002528d49
Merge branch 'develop' into feature/Prototype_R_LEVEL
# Conflicts:
#	godot/Main.tscn
#	godot/gui/GameOver.tscn
#	src/gui/game_over/GameOverScreen.cpp
2022-09-01 16:13:55 -04:00
7236428157 coin and bgm added, game over music still not done 2022-09-01 15:55:02 -04:00
cb81734279
make enemies use the event bus 2022-09-01 11:26:34 -04:00
07520324cb
lower default volume 2022-08-28 01:54:45 -04:00
a72954b578
add blightwing's behavior 2022-08-04 00:59:10 -04:00
89f1ac5303
make dreadtooth animation start automatically 2022-08-04 00:56:14 -04:00
f8f1210e61
Merge branch 'develop' into feature/enemies
# Conflicts:
#	godot/characters/player/Player.tscn
2022-07-27 00:08:25 -04:00
8cfa1d5cce
add sounds and adjust music 2022-07-26 23:14:21 -04:00
edd24b6798
undo accidental collision extents change 2022-07-21 00:17:12 -04:00
948f4ce911
add some enemy behavior prototypes 2022-07-21 00:05:08 -04:00
4196f4d9e9
change collision layers and masks 2022-06-17 11:33:58 -04:00
7d62b37ffc
add enemy scenes 2022-05-25 16:13:29 -04:00
6874c86786
change default player direction to the right 2022-04-21 23:33:00 -04:00
ef4ec86071 update maps and tilesets 2022-04-16 20:05:32 -04:00
ecd6fe45b2
add state machine and have player use it 2022-04-11 13:30:51 -04:00
35af76cda4
detatch script 2022-04-09 22:21:04 -04:00
ac86f148ba
merge develop 2022-04-09 22:16:27 -04:00
756b42bf82
change the game name 2022-04-09 21:50:08 -04:00
aeb3816ded
change player collision shape to a rectangle 2022-04-06 23:43:23 -04:00
a2ad48e900
prototype 2022-04-05 14:51:59 -04:00