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

11 Commits

Author SHA1 Message Date
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
Clément Le Bihan
e1fb1298d0 setting blowablePass on bonuses & player 2021-06-15 00:32:22 +02:00
Zoe Roux
86e25d2b94 Merging with develop 2021-06-14 17:50:07 +02:00
arthur.jamet
d17836685e fix memory errors realted to cache 2021-06-14 17:34:06 +02:00
Clément Le Bihan
85dcf80256 fixing player pos and rm debug print 2021-06-14 16:45:43 +02:00
Zoe Roux
5ea5e048c9 Disabling animations while they segfault 2021-06-14 16:18:33 +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
Zoe Roux
10a73e07d1 Cleaning u 2021-06-14 16:07:24 +02:00
Zoe Roux
9b385349dc Trying things. 2021-06-14 16:00:41 +02:00
Zoe Roux
06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00
arthur.jamet
3244110d27 split runner file: game scene 2021-06-14 10:47:44 +02:00