Proyecto-Titulo
/
alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

develop #50

Merged
cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00
Conversation 0 Commits 47 Files Changed 45 +698 -129

47 Commits

Author SHA1 Message Date
Chris Cromer 54cea89810 Merge branch 'master' into develop 2022-09-02 00:37:22 -04:00
Chris Cromer 03c9614f4d Merge pull request 'ready for version 1.0.0' (#49) from feature/version_change into develop 
Reviewed-on: #49
 2022-09-01 23:32:03 -04:00
Chris Cromer 729d808086
ready for version 1.0.0 2022-09-01 23:31:23 -04:00
Martin Araneda 28ba710581 Merge pull request 'feature/music' (#48) from feature/music into develop 
Reviewed-on: #48
 2022-09-01 23:25:14 -04:00
Martin Araneda 866944b784 Added victory sound to assets 2022-09-01 23:22:56 -04:00
Martin Araneda e7a1b4f2f8 Added music to VictoryScreen 2022-09-01 23:22:37 -04:00
Martin Araneda e62acd3ab1 final changes to music 2022-09-01 23:22:10 -04:00
Martin Araneda a8e364415c changed coin type format to avoid negatives 2022-09-01 23:21:30 -04:00
Martin Araneda 2c5d3d9afe validation over 100 coins 2022-09-01 23:20:53 -04:00
Chris Cromer c09c52797c Merge pull request 'feature/Prototype_R_LEVEL' (#47) from feature/Prototype_R_LEVEL into develop 
Reviewed-on: #47
 2022-09-01 22:36:03 -04:00
Martin Araneda fa4cff9c57 Added some visual details to the PrototypeR map 2022-09-01 22:33:43 -04:00
Martin Araneda e6b170e4d8 Remove unused signals 2022-09-01 22:32:52 -04:00
Martin Araneda 9388e6f6f5 Added some enemies 2022-09-01 22:21:13 -04:00
Martin Araneda 346af5dd44 Merge branch 'develop' into feature/Prototype_R_LEVEL 
# Conflicts:
#	godot/levels/Prototype.tscn
 2022-09-01 22:04:21 -04:00
Martin Araneda bc572df9f9 Added coins and enemies to the PrototypeR map 2022-09-01 22:01:45 -04:00
Martin Araneda 8adf91247e Adjust jump volume 2022-09-01 22:01:16 -04:00
Martin Araneda ba46d6c65b Make player using the event bus for enemies touching him 2022-09-01 22:00:59 -04:00
Martin Araneda 6c0b656d79 change music file name 2022-09-01 21:59:58 -04:00
Martin Araneda 011a1b8007 make the enemies use the event bus 2022-09-01 21:59:21 -04:00
Chris Cromer 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
Chris Cromer 3ca5f4e7b2
improve coin counter HUD 2022-09-01 18:34:37 -04:00
Martin Araneda 1f63f5e00a Player touched signal added 2022-09-01 16:37:50 -04:00
Martin Araneda 2e07679b52 minor fix 2022-09-01 16:18:38 -04:00
Chris Cromer 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
Martin Araneda 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
Martin Araneda 3f45f3f5a9 Merge branch 'feature/Prototype_R_LEVEL' into feature/PROTOTYPE_R_SOUNDS 2022-09-01 15:58:59 -04:00
Martin Araneda 7236428157 coin and bgm added, game over music still not done 2022-09-01 15:55:02 -04:00
Chris Cromer 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
Chris Cromer e981295e5f
fix windows build 
gnu++17 doesn't support inline variables but c++17 does
 2022-09-01 12:28:00 -04:00
Chris Cromer fe9cebc620
fix notifier bug, it only effected the exported game 2022-09-01 12:26:59 -04:00
Chris Cromer d560d13627
fix pause bug when monitor isn't present 2022-09-01 12:26:26 -04:00
Chris Cromer 083db48f04
rename directory to lowercase 2022-09-01 11:31:47 -04:00
Chris Cromer 629c41c235
fix spacing 2022-09-01 11:31:23 -04:00
Chris Cromer 5d611f790d
make the restart button send the game started event 2022-09-01 11:30:58 -04:00
Chris Cromer e29492447d
change the way level gets loaded and use the event bus 2022-09-01 11:30:01 -04:00
Chris Cromer cb81734279
make enemies use the event bus 2022-09-01 11:26:34 -04:00
Chris Cromer ea83bf8660
add new events 2022-09-01 11:24:46 -04:00
Chris Cromer 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
Chris Cromer 08216d061c
add a win screen when the flag is reached 2022-08-31 01:07:56 -04:00
Chris Cromer 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
Chris Cromer ee34563424
add player won signal 2022-08-31 00:24:38 -04:00
Chris Cromer 8863a74c09
remove node include 2022-08-31 00:24:02 -04:00
Chris Cromer bc82d3d08c
fix header guards 2022-08-31 00:05:08 -04:00
Chris Cromer 0f94363266
refactor game over screen 2022-08-30 23:58:02 -04:00
Martin Araneda 0e4bad4823 R prototype lvl made. Coins and coinHUD added 2022-08-28 20:15:40 -04:00
Martin Araneda 7e57e78205 Revert "no changes" 
This reverts commit b718c0f31b.
 2022-08-28 15:04:50 -04:00
Martin Araneda b718c0f31b no changes 2022-08-28 15:03:53 -04:00