zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 13:25:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
778 Commits 4 Branches 6 Tags
0467ebc8ff0f15a7ff094c51279a7a0c3773b4e9
Commit Graph

88 Commits

Author SHA1 Message Date
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
Askou
b7149a7a7a replace NOTHING by BREAKABLE in getRandomBlockType() 2021-06-14 15:15:19 +02:00
Askou
2260f8ba4f set full heigth map at -1 to check if their height 2021-06-14 15:13:45 +02:00
Clément Le Bihan
fcb9d540b7 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into making_bonuses_blowable_and_fix_bomb 2021-06-14 14:51:42 +02:00
Clément Le Bihan
a229452dc4 adding red color for collisions boxes 2021-06-14 14:41:04 +02:00
Askou
7a21b8ed94 add brackets for clarification 2021-06-14 14:27:52 +02:00
Askou
53f0811b75 merge develop in gravity_component 2021-06-14 10:46:07 +02:00
Askou
230b611b69 Add another flat map type 2021-06-14 10:01:56 +02:00
Askou
fd391d869e remove ugly 20lines createSpawner 2021-06-12 11:09:24 +02:00
Askou
73b8cc5ccd fix floor hitbox on no floor map 2021-06-11 19:25:43 +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
HENRY Benjamin
4e5e7aee1d explosion texture added (and merged with develop) 2021-06-11 12:13:39 +02:00
Askou
b39e4ad57a merge blowable bonus et fix bomb 2021-06-11 11:47:19 +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
Askou
01e5900bbe check in collision if it's a movable 2021-06-11 09:39:31 +02:00
Clément Le Bihan
2a82f46e49 adding blowable tag to bonuses but the bomb exploded the bonuses instantly 2021-06-10 23:12:47 +02:00
Askou
34f9301ac1 Player can't walk on breakable and unbreakable 2021-06-10 14:45:35 +02:00
Zoe Roux
c6f7cd17f2 Merging with bonuses 2021-06-10 11:36:16 +02:00
Askou
4a1e7b085f bumperComponent + fix map 2021-06-10 11:24:47 +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
HENRY Benjamin
2955cd76a7 added a bandage to a huge wound (collisionsystem wasn't calling the two callbacks, just one, now it's still only one, but the bonuses are applied only if you're on them 2021-06-09 22:22:27 +02:00
Askou
69563ad075 Merge remote-tracking branch 'origin/hole_bumper_collision' into gravity_component 2021-06-09 17:44:43 +02:00
Clément Le Bihan
fdcea71fcd fixing keyboard (he was switching between a and d) 2021-06-09 17:43:38 +02:00
Zoe Roux
6667344592 Making left and right block solids 2021-06-09 16:53:27 +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
Askou
c416e5e0b8 Merge branch 'develop' into hole_bumper_collision 2021-06-09 15:43:10 +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
a9669a7858 Disabling bomb collisions 2021-06-09 14:20:01 +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
Zoe Roux
a6b4f1717a Finishing exploson radius 2021-06-09 12:10:19 +02:00
Askou
b552ee3d45 add collision for bumper and hole 2021-06-09 11:57:25 +02:00
Askou
b6b2b5ffc9 fix useless if that called STAIRS enum 2021-06-09 10:57:55 +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
EternalRat
ee7b4c2c8f merge from develop 2021-06-08 17:02:00 +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
395566598c last fixes 2021-06-08 12:02:56 +02:00
Clément Le Bihan
d08613a9d4 zoe has to smile ! 2021-06-08 11:58:30 +02:00
Clément Le Bihan
aba85c918e adding QoL changes 2021-06-08 01:10:15 +02:00
Clément Le Bihan
ca930db44d more cleanup 2021-06-08 00:55:32 +02:00
Clément Le Bihan
556021a4ef map colliders seems nice 2021-06-08 00:35:34 +02:00
Clément Le Bihan
22606ecf68 giving the collided Axis for context to callback on collisions 2021-06-08 00:19:34 +02:00
Clément Le Bihan
65af11f3f9 collisions are working ok with user defined offsets 2021-06-07 23:37:51 +02:00