Commit Graph

116 Commits

Author SHA1 Message Date
346af5dd44 Merge branch 'develop' into feature/Prototype_R_LEVEL
# Conflicts:
#	godot/levels/Prototype.tscn
2022-09-01 22:04:21 -04:00
bc572df9f9 Added coins and enemies to the PrototypeR map 2022-09-01 22:01:45 -04:00
8adf91247e Adjust jump volume 2022-09-01 22:01:16 -04:00
6c0b656d79 change music file name 2022-09-01 21:59:58 -04:00
011a1b8007 make the enemies use the event bus 2022-09-01 21:59:21 -04:00
3ca5f4e7b2
improve coin counter HUD 2022-09-01 18:34:37 -04:00
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
3f45f3f5a9 Merge branch 'feature/Prototype_R_LEVEL' into feature/PROTOTYPE_R_SOUNDS 2022-09-01 15:58:59 -04:00
7236428157 coin and bgm added, game over music still not done 2022-09-01 15:55:02 -04:00
083db48f04
rename directory to lowercase 2022-09-01 11:31:47 -04:00
e29492447d
change the way level gets loaded and use the event bus 2022-09-01 11:30:01 -04:00
cb81734279
make enemies use the event bus 2022-09-01 11:26:34 -04:00
08216d061c
add a win screen when the flag is reached 2022-08-31 01:07:56 -04:00
0f94363266
refactor game over screen 2022-08-30 23:58:02 -04:00
5c671a2fec
set coins and points back to 0 on start 2022-08-29 21:44:08 -04:00
0e4bad4823 R prototype lvl made. Coins and coinHUD added 2022-08-28 20:15:40 -04:00
7e57e78205 Revert "no changes"
This reverts commit b718c0f31b.
2022-08-28 15:04:50 -04:00
b718c0f31b no changes 2022-08-28 15:03:53 -04:00
07520324cb
lower default volume 2022-08-28 01:54:45 -04:00
14d29bbc7c
fix incorrect method name 2022-08-28 01:25:50 -04:00
3c8107ba9f
disable monitor by default in development 2022-08-28 01:04:47 -04:00
3bcbde8161 Game over screen finished 2022-08-27 22:34:18 -04:00
8b53f74929 Merge branch 'develop' into feature/Coin 2022-08-27 18:17:58 -04:00
a27f968297 add gameover 2022-08-27 18:14:21 -04:00
3eb3d8765a
add event bus 2022-08-27 18:10:36 -04:00
a9f26a8408
Merge branch 'develop' into feature/Coin
# Conflicts:
#	godot/Main.tscn
#	godot/project.godot
2022-08-26 13:54:25 -04:00
7083f680ee
ignore delta since we don't use it 2022-08-26 13:48:39 -04:00
0c8c3f6d1b
fix level not loading when monitor is disabled 2022-08-26 10:51:16 -04:00
bb0c4e302d
submit form when enter is pressed 2022-08-25 10:11:46 -04:00
563cdade00
refactor code to be more decoupled 2022-08-14 16:53:44 -04:00
2a7b20ed54
dynamically load monitor and crt shader 2022-08-14 15:15:36 -04:00
0000cd114c
add default player info for quicker development 2022-08-14 12:43:25 -04:00
8e5c035675
fix monitor bug where player info wasn't being sent 2022-08-14 12:42:49 -04:00
64102a992a GameOverScreen .h/.cpp made. Godot scene completed 2022-08-12 21:50:48 -04:00
5d1f634e08
Merge branch 'develop' into feature/enemies 2022-08-06 16:49:30 -04:00
eb22e8b883
fix text spacing 2022-08-06 16:47:23 -04:00
81faf5d32e
Merge branch 'develop' into feature/enemies 2022-08-05 13:57:21 -04:00
0f85d5cfa3
use the Time singleton instead of OS singleton
time functions in OS are being deprecated and will be removed in gotod 4.0
2022-08-05 13:23:45 -04:00
5ce3a2f37c
add blightwing prototype example 2022-08-04 00:59:48 -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
09916a0598
Merge branch 'develop' into feature/enemies 2022-08-03 21:40:09 -04:00
457915a46a
add CRT shader 2022-08-03 21:38:13 -04:00
4267332d70
move the level instance to a level node so that pausing the game doesn't effect the main node 2022-08-03 21:25:19 -04:00
e54e3b0687 changes to coinHUD 2022-08-01 15:05:09 -04:00
2be22ceb68 Merge branch 'develop' into feature/Coin
# Conflicts:
#	godot/Main.tscn
2022-08-01 14:17:05 -04:00
b24c9e8732 fix goal state 2022-08-01 14:10:00 -04:00
f8f1210e61
Merge branch 'develop' into feature/enemies
# Conflicts:
#	godot/characters/player/Player.tscn
2022-07-27 00:08:25 -04:00
f9e70eae01
connect signals to the dreadteeth 2022-07-27 00:03:18 -04:00
8cfa1d5cce
add sounds and adjust music 2022-07-26 23:14:21 -04:00