feature/Prototype_R_LEVEL #47

Merged
cromer merged 18 commits from feature/Prototype_R_LEVEL into develop 2022-09-01 22:36:04 -04:00

18 Commits

Author SHA1 Message Date
fa4cff9c57 Added some visual details to the PrototypeR map 2022-09-01 22:33:43 -04:00
e6b170e4d8 Remove unused signals 2022-09-01 22:32:52 -04:00
9388e6f6f5 Added some enemies 2022-09-01 22:21:13 -04:00
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
ba46d6c65b Make player using the event bus for enemies touching him 2022-09-01 22:00:59 -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
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
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