Commit Graph

224 Commits

Author SHA1 Message Date
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
3c8107ba9f
disable monitor by default in development 2022-08-28 01:04:47 -04:00
156d3ddcae
Merge branch 'develop' into feature/cleanup
# Conflicts:
#	src/godot.cpp
#	src/player/Player.cpp
2022-08-28 00:38:08 -04:00
1f4d2b1b72 Merge pull request 'feature/Coin' (#32) from feature/Coin into develop
Reviewed-on: #32
2022-08-27 22:39:00 -04:00
3bcbde8161 Game over screen finished 2022-08-27 22:34:18 -04:00
705ed4e897 Use event bus for coins 2022-08-27 18:32:33 -04:00
8b53f74929 Merge branch 'develop' into feature/Coin 2022-08-27 18:17:58 -04:00
195c7015af Merge pull request 'add event bus' (#31) from feature/event_bus into develop
Reviewed-on: #31
2022-08-27 18:16:28 -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
c102c2ad3f
use empty PackedScene instead of nullptr 2022-08-27 00:25:15 -04:00
9e0d428ffa
include forgotten header 2022-08-26 23:57:12 -04:00
1a2c5eab98
improve default values 2022-08-26 23:56:30 -04:00
ddb630ca3e
change NULL to nullptr 2022-08-26 21:43:09 -04:00
3478127e86
remove main namespace 2022-08-26 21:02:40 -04:00
0f4e77d4b7
cleanup c++ code 2022-08-26 19:27:57 -04:00
a9f26a8408
Merge branch 'develop' into feature/Coin
# Conflicts:
#	godot/Main.tscn
#	godot/project.godot
2022-08-26 13:54:25 -04:00
b74a8ce1aa
fix function name and pointer usage 2022-08-26 13:51:19 -04:00
ff600cd761
fix spacing 2022-08-26 13:48:59 -04:00
7083f680ee
ignore delta since we don't use it 2022-08-26 13:48:39 -04:00
2f3ae6e17c Merge pull request 'develop' (#30) from develop into master
Reviewed-on: #30
2022-08-26 10:53:58 -04:00
8321c8a610 Merge pull request 'feature/fix_monitor' (#29) from feature/fix_monitor into develop
Reviewed-on: #29
2022-08-26 10:53:09 -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
e7fb9dff03
fix incorrect name in log 2022-08-14 13:18:09 -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
0ca95eacce Merge pull request 'feature/enemies' (#28) from feature/enemies into develop
Reviewed-on: #28
2022-08-07 18:54:14 -04:00