zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-06-04 10:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 4 Branches 6 Tags
master
Commit Graph

57 Commits

Author SHA1 Message Date
Clément Le Bihan fe62e13433 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into shader_to_property 
# Conflicts:
#	sources/System/BombHolder/BombHolderSystem.cpp
 2021-06-19 01:12:34 +02:00
arthur.jamet 8d9234ceae for structural binding variable mistake 2021-06-17 22:07:56 +02:00
arthur.jamet 051096a194 fix compile errors 2021-06-17 20:50:43 +02:00
Clément Le Bihan bc8504a026 adding position in shader 2021-06-17 18:22:59 +02:00
Zoe Roux fcb1c91044 Fixing multiple bombs at the same pos 2021-06-17 14:00:30 +02:00
Zoe Roux 4f782e9d75 Spawning a bomb inside a player dont block him anymore 2021-06-17 12:37:40 +02:00
Clément Le Bihan 7fdb5a051d mesh encapsulation done 2021-06-16 18:17:17 +02:00
Clément Le Bihan c9753577da rm comment 2021-06-16 17:47:35 +02:00
Clément Le Bihan 05806fd2c3 rm unused global 2021-06-16 17:22:33 +02:00
Clément Le Bihan 8f97dd8863 adding white effect on bombs 2021-06-16 16:13:36 +02:00
Clément Le Bihan b6aa3f184a adding texture on shader 2021-06-16 11:13:02 +02:00
Clément Le Bihan e135d89add explosion effect is looking nice 2021-06-16 10:50:24 +02:00
Clément Le Bihan e9e389374b adding lonely option for shaders and adding a BombExplosionShaderComponent.cpp to save data 2021-06-16 10:30:10 +02:00
Clément Le Bihan 1fad8de0ca modif shaders callback (adding dtime) 2021-06-16 01:23:59 +02:00
Askou 11370c890d Add permanent bonuses except for wallpass 2021-06-15 14:35:59 +02:00
Clément Le Bihan 135216c53b indent fixes 2021-06-15 00:43:48 +02:00
Clément Le Bihan 2b70d4883f bombs are exploding in chain successfully adding BlowablePass tag 2021-06-15 00:30:47 +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
Clément Le Bihan 17fb5da6dc fixing naming issues and default args 2021-06-14 14:54:37 +02:00
Askou d3f77835d3 fix cmake not compiling because of git merge 2021-06-14 10:51:49 +02:00
Clément Le Bihan 6a9a09652a more indent fixes 2021-06-14 10:51:27 +02:00
Clément Le Bihan 7fb62d10f4 indent issues 2021-06-14 10:47:12 +02:00
Askou 53f0811b75 merge develop in gravity_component 2021-06-14 10:46:07 +02:00
Askou a9edacd41b remove debug print in bombHolderSystem 2021-06-11 19:27:02 +02:00
Clément Le Bihan 00bae401a0 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into making_bonuses_blowable_and_fix_bomb 
# Conflicts:
#	sources/System/BombHolder/BombHolderSystem.cpp
 2021-06-11 16:53:02 +02:00
Clément Le Bihan dde64c99ab bonuses are collidable but the explosion is called multiple times 2021-06-11 15:32:03 +02:00
Clément Le Bihan 0108002bb5 testing bombs 2021-06-11 14:45:44 +02:00
HENRY Benjamin 4e5e7aee1d explosion texture added (and merged with develop) 2021-06-11 12:13:39 +02:00
Clément Le Bihan 74072064ea trying to save prevPos but it doesn't work 2021-06-11 00:11:34 +02:00
Zoe Roux c6f7cd17f2 Merging with bonuses 2021-06-10 11:36:16 +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 1dd4e0b22d Starting a bomb system 2021-06-09 18:00:15 +02:00
Zoe Roux c88f986328 Merge branch 'bonus' of github.com:AnonymusRaccoon/Bomberman into bomb-collision 2021-06-09 17:17:51 +02:00
HENRY Benjamin aa4953c9b6 explosion working 2021-06-09 16:40:02 +02:00
Zoe Roux 302cbe69b4 Merging with deevelop 2021-06-09 16:26:39 +02:00
HENRY Benjamin 99729153a3 deleted bad texture 2021-06-09 16:16:48 +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
Zoe Roux 84ff472f2a Real bombs collisions but waiting for origin/bonus to be merged 2021-06-09 14:36:19 +02:00
Zoe Roux a9669a7858 Disabling bomb collisions 2021-06-09 14:20:01 +02:00
arthur.jamet 9c1190be30 using glb model forexplosion 2021-06-09 12:48:20 +02:00
Zoe Roux b5264bea3e Making bombs collidables. For now thats not really a good idea 2021-06-09 12:30:14 +02:00
Zoe Roux a6b4f1717a Finishing exploson radius 2021-06-09 12:10:19 +02:00
HENRY Benjamin 54bc9ce5ac need to fix explosion.obj 2021-06-09 10:57:55 +02:00
EternalRat 3009e34ac3 increased range + damage bonus added, just miss ignorewalls now & sprite for the explosionrange bonus 2021-06-08 20:12:09 +02:00
Zoe Roux c69c87e910 Trying things 2021-06-08 17:52:52 +02:00
EternalRat 982050cb91 bombanimatorcomponent created, waiting for model to test 2021-06-08 16:41:59 +02:00
Zoe Roux 31f712531a Merging with develop 2021-06-07 21:58:07 +02:00