Commit Graph

697 Commits

Author SHA1 Message Date
Zoe Roux a42ca68595 Fixing play button and menu handling 2021-06-14 11:39:00 +02:00
Zoe Roux de579ccda6 Handling ready buttons 2021-06-14 10:42:50 +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
Zoe Roux 804361c763 Adding a lobby system 2021-06-11 11:31:31 +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 dc453362a8 lobby system: player connected texture update 2021-06-11 10:47:23 +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
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
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
arthur.jamet d328a976ed no model will be displayed in the lobby, only matching colors (thx raylib)
'
2021-06-10 13:54:28 +02:00
arthur.jamet e0b44b84bb no model will be displayed in the lobby, only matching colors (thx raylib)
'
2021-06-10 13:51:54 +02:00
arthur.jamet 3e8e1fe1ec tiles for when a player is ready to play 2021-06-10 12:43:36 +02:00
arthur.jamet fb805459be lobby 2021-06-10 12:19:55 +02:00
arthur.jamet 5878dd46f4 first commit on branch 2021-06-10 12:01:35 +02:00
Clément Le Bihan ffccdf6fcb Merge pull request #138 from AnonymusRaccoon/independant_player_models
player models are now independant
2021-06-10 11:08:24 +02:00
Clément Le Bihan 13e6b0e7be small weird fixes 2021-06-10 11:03:46 +02:00
Clément Le Bihan 54f2944432 fixing indentation in KeyboardComponent.hpp 2021-06-10 10:58:12 +02:00
Clément Le Bihan 87303195c5 fixing indentation 2021-06-10 10:56:49 +02:00
arthur.jamet 5759d770fa keyboard compoent 2021-06-10 10:33:11 +02:00
arthur.jamet 0ad827c37b player models are now independant 2021-06-10 09:58:52 +02:00
Zoe Roux ad7b10e687 Merge pull request #129 from AnonymusRaccoon/menuControllable
First Menus
0.1.0
2021-06-09 17:09:21 +02:00
Zoe Roux 7a641835a6 Merging with develop 2021-06-09 17:07:14 +02:00
Clément Le Bihan 63ca018edf Merge pull request #124 from AnonymusRaccoon/shader_non_broken
Shaders
2021-06-09 16:26:58 +02:00
Zoe Roux 302cbe69b4 Merging with deevelop 2021-06-09 16:26:39 +02:00
Zoe Roux 4f50985fe1 Fixing wasm 2021-06-09 16:13:12 +02:00
Zoe Roux c94237dedc Adding a onStart onStop 2021-06-09 16:00:06 +02:00
arthur.jamet 52bd28a830 sound callback ok 2021-06-09 15:54:28 +02:00
arthur.jamet 6f0ecbf3bd music settings work youhou 2021-06-09 15:39:48 +02:00
arthur.jamet e4209c3ca2 fix merge + convert audio ressources + add sounds/music to scenes 2021-06-09 15:21:00 +02:00
Tom AUGIER 1e2c309122 Merge pull request #135 from AnonymusRaccoon/fix_sound_issue
add cache to sound
2021-06-09 15:06:15 +02:00
Zoe Roux 238f18b4bc Merge pull request #133 from AnonymusRaccoon/bomb-wall
Bomb wall
2021-06-09 15:05:41 +02:00
Askou d261a4b585 add cache to sound 2021-06-09 14:59:55 +02:00
Zoe Roux c544a83ee8 Merging with develop 2021-06-09 14:52:18 +02:00
Zoe Roux f4c975dbcb Using tabs in the cmake 2021-06-09 14:47:54 +02:00
Zoe Roux 6218a4243f Merge pull request #131 from AnonymusRaccoon/cache
Cache System - Lonely
2021-06-09 14:37:11 +02:00
Zoe Roux 78da9a5ccc Merging with develop 2021-06-09 14:21:49 +02:00
Zoe Roux a9669a7858 Disabling bomb collisions 2021-06-09 14:20:01 +02:00
Tom AUGIER bb9102c883 Merge pull request #130 from AnonymusRaccoon/fix_map
replace stairs by bumper and add assets for it
2021-06-09 14:19:35 +02:00
Zoe Roux 9da378443e Merge pull request #127 from AnonymusRaccoon/music_component
Music/Sound component
2021-06-09 14:13:19 +02:00
Zoe Roux b5264bea3e Making bombs collidables. For now thats not really a good idea 2021-06-09 12:30:14 +02:00
arthur.jamet 0174d121f1 cache system test 2021-06-09 12:25:21 +02:00
Zoe Roux 7aa356aeca Merging with develop 2021-06-09 12:17:20 +02:00