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

859 Commits

Author SHA1 Message Date
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
Bluub a96c5b770d add unbreakable tag 2021-06-09 15:55:59 +02:00
arthur.jamet 52bd28a830 sound callback ok 2021-06-09 15:54:28 +02:00
Bluub d141c13abf merge develop 2021-06-09 15:51:08 +02:00
Askou c416e5e0b8 Merge branch 'develop' into hole_bumper_collision 2021-06-09 15:43:10 +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
HENRY Benjamin 0de77bcdfc readded one include 2021-06-09 15:00:01 +02:00
Askou d261a4b585 add cache to sound 2021-06-09 14:59:55 +02:00
HENRY Benjamin 6d22286942 removed useless include 2021-06-09 14:59:13 +02:00
HENRY Benjamin 012e9ff054 removed positioncomponent into healthsystem 2021-06-09 14:58:45 +02:00
Bluub 5f7bcf2a8f type check 2021-06-09 14:53:41 +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 84ff472f2a Real bombs collisions but waiting for origin/bonus to be merged 2021-06-09 14:36:19 +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
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 7aa356aeca Merging with develop 2021-06-09 12:17:20 +02:00
HENRY Benjamin 93a4fa792c removed ignore walls bonus (sorry clément :( ) 2021-06-09 12:15:01 +02:00
Zoe Roux a6b4f1717a Finishing exploson radius 2021-06-09 12:10:19 +02:00
Bluub 41ff375d6a using luabridge, binding MapInfo type and calling update 2021-06-09 12:08:40 +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 1470371c10 reposition camera 2021-06-09 11:58:27 +02:00
Askou b552ee3d45 add collision for bumper and hole 2021-06-09 11:57:25 +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 b6b2b5ffc9 fix useless if that called STAIRS enum 2021-06-09 10:57:55 +02:00
HENRY Benjamin 54bc9ce5ac need to fix explosion.obj 2021-06-09 10:57:55 +02:00
Askou 544def1dbd fix system name 2021-06-09 10:55:08 +02:00
Askou 16da280d15 fix little beauty issues 2021-06-09 10:52:30 +02:00
Askou 6f24139e29 remove stairs 2021-06-09 10:45:14 +02:00
Askou 8f92e7a337 replace stairs by bumper and add assets for it 2021-06-09 10:28:28 +02:00
HENRY Benjamin 821fa7c6e5 Merge branch 'develop' into bomb_animator 2021-06-09 10:10:42 +02:00
Askou ff7d9d411b full map not needed anymore 2021-06-09 09:53:28 +02:00
EternalRat 97b7a7d259 timer added to speedup bonus (15s) 2021-06-08 21:05:08 +02:00
EternalRat 58bbd1fb93 Update speedup bonus & fixing one bug (double bonus/...) 2021-06-08 20:37:10 +02:00
arthur.jamet 3948b5f94c credit scene 2021-06-08 20:15:11 +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
Tom AUGIER 07f61fb462 Merge branch 'develop' into music_component 2021-06-08 20:08:38 +02:00
arthur.jamet 783704d11e fix sound asset 2021-06-08 19:17:12 +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 3b2eeba83f sound now has a shared ptr 2021-06-08 17:58:20 +02:00
Zoe Roux c69c87e910 Trying things 2021-06-08 17:52:52 +02:00