23 Commits

Author SHA1 Message Date
Clément Le Bihan
5481f96e9b Merge pull request #260 from AnonymusRaccoon/fix_pause
Fixing the pause movements
2021-06-20 19:28:07 +02:00
Zoe Roux
5293222f88 Resetting the velocity on death 2021-06-20 19:19:35 +02:00
Zoe Roux
e2386e885b Fixing the pause movements 2021-06-20 19:16:23 +02:00
EternalRat
f3ce52407e now vector playersInfos will be clear each time we resume a game :D 2021-06-20 18:38:43 +02:00
arthur.jamet
5d89c20277 Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into soundfix 2021-06-20 13:33:52 +02:00
arthur.jamet
3f86d506f7 fixing missing sounds 2021-06-20 13:29:38 +02:00
Clément Le Bihan
4d1c16a233 fixing tag component and rm unused includes 2021-06-20 12:47:14 +02:00
Zoe Roux
de6bdf61fe Fixing the pause timer 2021-06-20 12:17:43 +02:00
Clément Le Bihan
a0b7141f88 fxing waird apparently cam related error 2021-06-19 16:01:45 +02:00
Clément Le Bihan
462628b90e fixing throw 2021-06-19 14:48:59 +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
Zoe Roux
ffae0f52cf Fixing windows compilation 2021-06-18 20:54:06 +02:00
Zoe Roux
a55b1543c9 Adding a restart timer when resuming the game 2021-06-18 17:56:34 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
EternalRat
970df6570c fixed resumelobby 2021-06-18 14:10:20 +02:00
arthur.jamet
f23a58a616 add backgrounds 2021-06-18 11:50:23 +02:00
Benjamin HENRY
93c8fb1192 Merge branch 'develop' into parser 2021-06-17 21:54:54 +02:00
arthur.jamet
a8f5cb85a5 fix sound on click 2021-06-17 09:47:36 +02:00
EternalRat
9cb097c8b7 creation of the folder save 2021-06-16 14:45:11 +02:00
EternalRat
e203860cfb fixed indentations 2021-06-16 13:27:18 +02:00
EternalRat
2ed5b79cfc added speed to the save 2021-06-16 11:47:46 +02:00
Zoe Roux
06a6eb2ed7 Merging with develop 2021-06-14 13:50:47 +02:00
arthur.jamet
73ee44d708 split runner file: remove unnecessary includes 2021-06-14 11:04:52 +02:00