|
|
615b2a0ba2
|
Merge pull request 'improve coin counter HUD' (#46) from feature/cleanup_coin_counter into develop
Reviewed-on: #46
|
2022-09-01 18:35:59 -04:00 |
|
|
|
3ca5f4e7b2
|
improve coin counter HUD
|
2022-09-01 18:34:37 -04:00 |
|
|
|
1f63f5e00a
|
Player touched signal added
|
2022-09-01 16:37:50 -04:00 |
|
|
|
2e07679b52
|
minor fix
|
2022-09-01 16:18:38 -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 |
|
|
|
46f32da8ff
|
Merge pull request 'feature/PROTOTYPE_R_SOUNDS' (#45) from feature/PROTOTYPE_R_SOUNDS into feature/Prototype_R_LEVEL
Reviewed-on: #45
|
2022-09-01 15:59:13 -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 |
|
|
|
2818e210c9
|
Merge pull request 'feature/monitor_debug' (#44) from feature/monitor_debug into develop
Reviewed-on: #44
|
2022-09-01 13:03:32 -04:00 |
|
|
|
e981295e5f
|
fix windows build
gnu++17 doesn't support inline variables but c++17 does
|
2022-09-01 12:28:00 -04:00 |
|
|
|
fe9cebc620
|
fix notifier bug, it only effected the exported game
|
2022-09-01 12:26:59 -04:00 |
|
|
|
d560d13627
|
fix pause bug when monitor isn't present
|
2022-09-01 12:26:26 -04:00 |
|
|
|
083db48f04
|
rename directory to lowercase
|
2022-09-01 11:31:47 -04:00 |
|
|
|
629c41c235
|
fix spacing
|
2022-09-01 11:31:23 -04:00 |
|
|
|
5d611f790d
|
make the restart button send the game started event
|
2022-09-01 11:30:58 -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 |
|
|
|
ea83bf8660
|
add new events
|
2022-09-01 11:24:46 -04:00 |
|
|
|
df420f698d
|
Merge pull request 'feature/win_screen' (#43) from feature/win_screen into develop
Reviewed-on: #43
|
2022-08-31 01:11:58 -04:00 |
|
|
|
08216d061c
|
add a win screen when the flag is reached
|
2022-08-31 01:07:56 -04:00 |
|
|
|
eb14adbb0e
|
add the godot namespace to the calls so it is more clear where the method resides
|
2022-08-31 00:36:01 -04:00 |
|
|
|
ee34563424
|
add player won signal
|
2022-08-31 00:24:38 -04:00 |
|
|
|
8863a74c09
|
remove node include
|
2022-08-31 00:24:02 -04:00 |
|
|
|
bc82d3d08c
|
fix header guards
|
2022-08-31 00:05:08 -04:00 |
|
|
|
0f94363266
|
refactor game over screen
|
2022-08-30 23:58:02 -04:00 |
|
|
|
08c815ba65
|
Merge pull request 'develop' (#42) from develop into master
Reviewed-on: #42
|
2022-08-29 21:46:11 -04:00 |
|
|
|
9cc3dc0978
|
Merge branch 'master' into develop
|
2022-08-29 21:46:01 -04:00 |
|
|
|
bad5a35339
|
Merge pull request 'set coins and points back to 0 on start' (#41) from feature/monitor into develop
Reviewed-on: #41
|
2022-08-29 21:45:35 -04:00 |
|
|
|
5c671a2fec
|
set coins and points back to 0 on start
|
2022-08-29 21:44:08 -04:00 |
|
|
|
066012bd1b
|
Merge pull request 'develop' (#40) from develop into master
Reviewed-on: #40
|
2022-08-29 20:51:15 -04:00 |
|
|
|
53c17f9e43
|
Merge branch 'master' into develop
|
2022-08-29 20:51:09 -04:00 |
|
|
|
63cb0ef4be
|
Merge pull request 'feature/fix_enemies' (#39) from feature/fix_enemies into develop
Reviewed-on: #39
|
2022-08-29 20:50:48 -04:00 |
|
|
|
12df454946
|
add some more checks to make sure a node is loaded before using it
|
2022-08-29 20:48:29 -04:00 |
|
|
|
a34ca72577
|
fix sounds when jumping on enemy
|
2022-08-29 20:17:12 -04:00 |
|
|
|
e972ed4c99
|
Merge pull request 'develop' (#38) from develop into master
Reviewed-on: #38
|
2022-08-28 20:47:38 -04:00 |
|
|
|
e5d92c8267
|
Merge branch 'master' into develop
|
2022-08-28 20:47:32 -04:00 |
|
|
|
0668f53641
|
Merge pull request 'feature/lower_volume' (#37) from feature/lower_volume into develop
Reviewed-on: #37
|
2022-08-28 20:46:57 -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 |
|
|
|
b9570c5f16
|
play jump sound when bouncing on enemy
|
2022-08-28 01:57:37 -04:00 |
|
|
|
07520324cb
|
lower default volume
|
2022-08-28 01:54:45 -04:00 |
|
|
|
f8cc1548e6
|
Merge pull request 'develop' (#36) from develop into master
Reviewed-on: #36
|
2022-08-28 01:28:58 -04:00 |
|
|
|
5c78dd3260
|
Merge branch 'master' into develop
|
2022-08-28 01:28:52 -04:00 |
|
|
|
dc93491cb5
|
Merge pull request 'fix incorrect method name' (#35) from feature/fix into develop
Reviewed-on: #35
|
2022-08-28 01:26:36 -04:00 |
|
|
|
14d29bbc7c
|
fix incorrect method name
|
2022-08-28 01:25:50 -04:00 |
|
|
|
816da5060b
|
Merge pull request 'develop' (#34) from develop into master
Reviewed-on: #34
|
2022-08-28 01:13:45 -04:00 |
|
|
|
2443caba88
|
Merge branch 'master' into develop
|
2022-08-28 01:13:17 -04:00 |
|
|
|
a57c4d420f
|
Merge pull request 'feature/cleanup' (#33) from feature/cleanup into develop
Reviewed-on: #33
|
2022-08-28 01:09:29 -04:00 |
|
|
|
39173cef21
|
cleanup code
|
2022-08-28 01:08:04 -04:00 |
|
