zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2026-02-10 07:26:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,347 Commits 4 Branches 6 Tags
develop
Commit Graph

144 Commits

Author SHA1 Message Date
Askou
75b3dc8e3a Fix collision 2021-06-19 16:59:14 +02:00
Clément Le Bihan
d8396337dd Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser 
# Conflicts:
#	sources/Map/Map.cpp
#	sources/Runner/GameScene.cpp
#	sources/Runner/PauseMenuScene.cpp
#	sources/Runner/Runner.cpp
#	sources/System/Controllable/ControllableSystem.cpp
#	sources/System/Lobby/LobbySystem.cpp
 2021-06-19 14:39:43 +02:00
Askou
d12b49c4ca map generate breakable again 2021-06-19 10:24:19 +02:00
Askou
520d717041 reduce holes hitbox but player can't pass trough them, he's too big right now 2021-06-19 10:22:25 +02:00
Askou
5d068b118e I have no clue why, bound is 0.75, 2, 0.75 when I set it a 0 0.75 0 2021-06-18 19:51:56 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
Askou
4acac815fd fix print and useless operation 2021-06-18 15:30:18 +02:00
Askou
b57be1f22b remove debug' 2021-06-18 15:07:16 +02:00
Askou
d77a73dc54 fix value for holes 2021-06-18 15:06:49 +02:00
Askou
a7f1c9da30 Hole don't kill instantly anymore 2021-06-18 14:47:09 +02:00
Clément Le Bihan
673d4f446d Merge pull request #212 from AnonymusRaccoon/fix_bonus_and_map 
Fix bonus and map
 2021-06-18 11:46:13 +02:00
Clément Le Bihan
dbf1d4e213 fixing warnings 2021-06-18 11:21:32 +02:00
Clément Le Bihan
01982d00fe Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into parser 
# Conflicts:
#	sources/Component/BombHolder/BombHolderComponent.cpp
#	sources/Map/Map.cpp
 2021-06-18 11:17:27 +02:00
Benjamin HENRY
93c8fb1192 Merge branch 'develop' into parser 2021-06-17 21:54:54 +02:00
arthur.jamet
051096a194 fix compile errors 2021-06-17 20:50:43 +02:00
Askou
85bf856507 remove unbreakbable on height 2021-06-17 17:23:28 +02:00
Askou
aae3c6c64c add new collision for map 2021-06-17 17:13:50 +02:00
Askou
991b77ad04 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture 2021-06-17 14:49:19 +02:00
Askou
55711dd343 change floor 2021-06-17 14:45:08 +02:00
Zoe Roux
741633b0fd Merging with develops 2021-06-17 14:38:49 +02:00
Zoe Roux
a02381b23c Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into fixs 2021-06-17 14:38:33 +02:00
Zoe Roux
e9c3f8e083 Fixing bonus collisions 2021-06-17 14:37:34 +02:00
Bluub
cb3c29369a john is running but need to fix ai not perfect precision 2021-06-17 02:45:19 +02:00
Zoe Roux
847e004980 Merging with develop 2021-06-16 17:38:59 +02:00
HENRY Benjamin
384c5e1188 merged with develop + everything working parser finish 2021-06-16 10:54:32 +02:00
HENRY Benjamin
cdfa4a4b03 parser & resume game finish 2021-06-16 10:40:50 +02:00
Bluub
765c1b214f Merge branch 'develop' into ai_script 2021-06-15 17:13:31 +02:00
Askou
3dfef8a0b3 fix collision 2021-06-15 16:55:45 +02:00
Askou
d795f36747 distri for bonus 2021-06-15 15:56:27 +02:00
Askou
fbe2900f39 merge develop in no_clip_bonus 2021-06-15 12:23:39 +02:00
Askou
eefc560a81 fix random chance of bonuses 2021-06-15 11:56:02 +02:00
Bluub
37358c55ea develop merge 2021-06-15 11:51:08 +02:00
Clément Le Bihan
238357aca9 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into bomb_explosion_chain 
# Conflicts:
#	sources/Runner/GameScene.cpp
 2021-06-15 11:43:39 +02:00
HENRY Benjamin
5ea702bcbd fixed what was say (music, bonus, ..) 2021-06-15 10:43:01 +02:00
Askou
3219928f37 no clip with 5s timer 2021-06-15 10:39:10 +02:00
Askou
2a1d56ed3b add no clip bonus 2021-06-15 10:35:06 +02:00
Askou
bb7fb53f31 fix invisible collision for the 10th in a row 2021-06-15 09:39:21 +02:00
Askou
8126d4a7e4 add timer on noclipBonus 2021-06-15 09:25:26 +02:00
Clément Le Bihan
e1fb1298d0 setting blowablePass on bonuses & player 2021-06-15 00:32:22 +02:00
EternalRat
56c84b09d5 load working 2021-06-14 19:20:10 +02:00
EternalRat
6aec0e8d71 need to fix (crash) 2021-06-14 18:21:45 +02:00
Clément Le Bihan
d164e3d407 fixing bomb stopper entity generation 2021-06-14 18:07:41 +02:00
EternalRat
5086e7ec03 need to merge with develop 2021-06-14 17:53:51 +02:00
Clément Le Bihan
ae24f075db Merge branch 'gravity_component' of github.com:AnonymusRaccoon/Bomberman into gravity_component 2021-06-14 17:26:21 +02:00
Clément Le Bihan
3eaa27003c readding Movable component of bonuses 2021-06-14 17:26:17 +02:00
Askou
7760f97b5a Rename ground entity 2021-06-14 17:25:34 +02:00
Askou
34eeb13286 Look at the correct block when we need to place collision for floor 2021-06-14 17:15:34 +02:00
Askou
8ecdc09e89 Merge branch 'gravity_component' of github.com:AnonymusRaccoon/Bomberman into gravity_component 2021-06-14 17:02:16 +02:00
Askou
4fb31b4598 fix collision on invisible height 2021-06-14 17:02:05 +02:00
Clément Le Bihan
85dcf80256 fixing player pos and rm debug print 2021-06-14 16:45:43 +02:00