zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-22 14:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
737 Commits 4 Branches 6 Tags
73ee44d7088f76dd0c97deedf64e2aa1e90dc970
Commit Graph

137 Commits

Author SHA1 Message Date
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
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
f8486c1ac1 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into develop 2021-06-10 15:19:51 +02:00
arthur.jamet
792483185f credit: fix controllable bug on credit scene 2021-06-10 15:19:38 +02:00
Zoe Roux
5646c0ecbd Bomb collisions should be good 2021-06-10 11:31:32 +02:00
Zoe Roux
4485f36aa2 Merging with develop 2021-06-10 11:16:57 +02:00
arthur.jamet
0ad827c37b player models are now independant 2021-06-10 09:58:52 +02:00
Zoe Roux
7a641835a6 Merging with develop 2021-06-09 17:07:14 +02:00
Zoe Roux
302cbe69b4 Merging with deevelop 2021-06-09 16:26:39 +02:00
HENRY Benjamin
19b91d58a5 need to fix collisionsystem 2021-06-09 16:13:23 +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
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
HENRY Benjamin
3a99e5913b fixed healthsystem, using callbacks to create bonuses and removed bonuscomponent (useless) 2021-06-09 14:49:37 +02:00
Zoe Roux
78da9a5ccc Merging with develop 2021-06-09 14:21:49 +02:00
Zoe Roux
7aa356aeca Merging with develop 2021-06-09 12:17:20 +02:00
Zoe Roux
a6b4f1717a Finishing exploson radius 2021-06-09 12:10:19 +02:00
HENRY Benjamin
5c357af61d PlayerBonus system & component made (containing timer) 2021-06-09 12:05:33 +02:00
Askou
77cf1a93e1 fix indent on runner 2021-06-09 12:05:18 +02:00
Askou
14328a68a0 add move sound 2021-06-09 11:21:13 +02:00
Askou
5df29e87c6 fix wrong system name in runner 2021-06-09 11:01:19 +02:00
Askou
ff7d9d411b full map not needed anymore 2021-06-09 09:53:28 +02:00
arthur.jamet
3948b5f94c credit scene 2021-06-08 20:15:11 +02:00
Tom AUGIER
07f61fb462 Merge branch 'develop' into music_component 2021-06-08 20:08:38 +02:00
Clément Le Bihan
efacfb53e3 fixing keyboard (he was switching between a and d) 2021-06-08 18:37:57 +02:00
Clément Le Bihan
44afd5cd44 adding joystick support for gamepad controller 2021-06-08 18:27:12 +02:00
arthur.jamet
3a40f0aba8 smarter event application 2021-06-08 17:36:29 +02:00
EternalRat
ee7b4c2c8f merge from develop 2021-06-08 17:02:00 +02:00
arthur.jamet
3e8acb5531 pause menu is different enough to know it's not the main menu 2021-06-08 16:43:03 +02:00
Clément Le Bihan
eecdc74918 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into shader_non_broken 
# Conflicts:
#	sources/Runner/Runner.cpp
 2021-06-08 16:32:21 +02:00
Clément Le Bihan
066d1dee42 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into shader_non_broken 
# Conflicts:
#	CMakeLists.txt
#	sources/Runner/Runner.cpp
 2021-06-08 16:29:57 +02:00
Clément Le Bihan
afc945c174 setting player's hitbox on his head too 2021-06-08 16:23:29 +02:00
arthur.jamet
29690b3744 fix button for pause menu opening 2021-06-08 16:21:03 +02:00
Clément Le Bihan
f74c053c80 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into collision_check_clem 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Map/Map.hpp
 2021-06-08 16:19:32 +02:00
EternalRat
4af99e75e5 bonus working, just miss 3 bonuses (cause bombholder isn't finish yet) 2021-06-08 16:14:37 +02:00
Clément Le Bihan
3e9037ed92 renaming shaderDrawable to shaderDrawable 2d 2021-06-08 16:10:20 +02:00
arthur.jamet
1e5d97f831 settings: minux/plus inverted 2021-06-08 16:00:30 +02:00
Clément Le Bihan
7bff82a5c9 shaders are working for models 2021-06-08 15:52:12 +02:00
arthur.jamet
a21bffb37b keyboard event are not responsive + pause menu access not working 2021-06-08 15:39:02 +02:00
Askou
6c7d8fcfcf add updateMusicStream + musicSystem 2021-06-08 14:52:03 +02:00
arthur.jamet
19daf95175 merging from develop 2021-06-08 14:38:37 +02:00
arthur.jamet
5fff4dce9f skelton of pause menu 2021-06-08 14:30:57 +02:00