zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-05-24 23:26:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 4 Branches 6 Tags
develop
Commit Graph

243 Commits

Author SHA1 Message Date
Zoe Roux 19d8425af0 Enabling height toogle 2021-06-15 17:05:26 +02:00
arthur.jamet eb65c73fbc add mouse system for button 2021-06-15 16:55:18 +02:00
Bluub 744ba32b80 Merge branch 'lobby' of github.com:AnonymusRaccoon/Bomberman into ai_script 2021-06-15 16:10:14 +02:00
Clément Le Bihan 9daaf54e94 vs shader works a little bit 2021-06-15 15:53:31 +02:00
arthur.jamet ca400d7c6b add ui on game 2021-06-15 15:36:55 +02:00
HENRY Benjamin 06f19f080b almost done, just need to link the lobby to the parser 2021-06-15 15:11:17 +02:00
arthur.jamet af599fac0f add how to play scene 2021-06-15 14:59:45 +02:00
Zoe Roux 123fe91080 Renaming the select button 2021-06-15 14:03:07 +02:00
arthur.jamet a0784875d3 sorting scores 2021-06-15 12:31:44 +02:00
Bluub 37358c55ea develop merge 2021-06-15 11:51:08 +02:00
arthur.jamet 005ddecf53 end condition: change scene only if scene has a player 2021-06-15 11:28:24 +02:00
HENRY Benjamin 5ea702bcbd fixed what was say (music, bonus, ..) 2021-06-15 10:43:01 +02:00
EternalRat 6aec0e8d71 need to fix (crash) 2021-06-14 18:21:45 +02:00
EternalRat 5086e7ec03 need to merge with develop 2021-06-14 17:53:51 +02:00
Zoe Roux 86e25d2b94 Merging with develop 2021-06-14 17:50:07 +02:00
Clément Le Bihan 0467ebc8ff Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into gravity_component 
# Conflicts:
#	sources/Runner/Runner.cpp
#	sources/System/BombHolder/BombHolderSystem.cpp
#	sources/System/BombHolder/BombHolderSystem.hpp
#	sources/System/Collision/CollisionSystem.cpp
issues on collisions
 2021-06-14 16:13:19 +02:00
EternalRat 19da647448 develop merged into parser 2021-06-14 15:26:42 +02:00
EternalRat 8122a2f31d just need to test, but need to merge before 2021-06-14 15:18:28 +02:00
Askou 2260f8ba4f set full heigth map at -1 to check if their height 2021-06-14 15:13:45 +02:00
Zoe Roux 06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00
Zoe Roux 60a5ad0ded Allowing the game to be started 2021-06-14 13:36:11 +02:00
Zoe Roux a42ca68595 Fixing play button and menu handling 2021-06-14 11:39:00 +02:00
Askou 993aadcf6c put classic mode 2021-06-14 11:27:49 +02:00
Bluub a6140f6087 random boy ai 2021-06-14 11:26:26 +02:00
arthur.jamet 73ee44d708 split runner file: remove unnecessary includes 2021-06-14 11:04:52 +02:00
arthur.jamet 3244110d27 split runner file: game scene 2021-06-14 10:47:44 +02:00
arthur.jamet ce8ce3b4a9 split runner file: splash, title + credit 2021-06-14 10:26:08 +02:00
Askou 230b611b69 Add another flat map type 2021-06-14 10:01:56 +02:00
arthur.jamet 5b45158d26 sound playing at end of intro 2021-06-12 14:59:40 +02:00
arthur.jamet b5d33751af square drwing 2021-06-12 14:18:42 +02:00
arthur.jamet 0a0501a044 splash screen has a scene on its own 2021-06-11 20:13:27 +02:00
arthur.jamet a1eb7be98b lobby: add background tiles with color code 2021-06-11 15:58:43 +02:00
Zoe Roux db8377ff4f Merge branch 'lobby' of github.com:AnonymusRaccoon/Bomberman into lobby 2021-06-11 15:32:55 +02:00
Zoe Roux fb1cfa3654 Adding ready handling for players 2021-06-11 15:32:49 +02:00
arthur.jamet 58f0ef48c2 add controll entity in credit scene 2021-06-11 15:13:21 +02:00
Zoe Roux ccde7a9879 Allowing players to join the lobby 2021-06-11 12:15:51 +02:00
Askou b39e4ad57a merge blowable bonus et fix bomb 2021-06-11 11:47:19 +02:00
Zoe Roux 804361c763 Adding a lobby system 2021-06-11 11:31:31 +02:00
Askou 36355f2d78 only use one collision for each floor instead of each upperfloor block +40fps 2021-06-11 11:21:29 +02:00
arthur.jamet cf1a64bb7c when the game is exited via pause, scene is unloaded 2021-06-11 11:18:06 +02:00
arthur.jamet a2e637d668 icons for lobby 2021-06-11 11:03:19 +02:00
arthur.jamet a333de99e5 play customization options move to lobby 2021-06-11 10:39:06 +02:00
arthur.jamet bbe543bc1f add play customization options (to move to lobby 2021-06-11 10:23:45 +02:00
Bluub 3631fe4203 merge develop 2021-06-11 09:47:09 +02:00
arthur.jamet cc1f5714b6 Merge branch 'lobby' of github.com:AnonymusRaccoon/Bomberman into lobby 2021-06-11 09:21:36 +02:00
arthur.jamet 0e54d83361 add back button to lobby scene 2021-06-11 09:21:17 +02:00
EternalRat eb52a8354a Merge branch 'develop' into parser 2021-06-10 22:24:05 +02:00
EternalRat ed99b93299 parser start 2021-06-10 22:23:29 +02:00
Zoe Roux 46491ce367 Trying things 2021-06-10 19:03:16 +02:00
Zoe Roux e38c2e56fe Making menues selectable by keyboard or controller 2021-06-10 18:05:56 +02:00