16 Commits

Author SHA1 Message Date
arthur.jamet
3f86d506f7 fixing missing sounds 2021-06-20 13:29:38 +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
Clément Le Bihan
09d73c7988 parser errors are updated and now loading failed return to main menu 2021-06-18 17:30:32 +02:00
HENRY Benjamin
19ad954c46 fixed loadedscene 2021-06-18 16:37:19 +02:00
HENRY Benjamin
7164a8b22c fixed one crash 2021-06-18 16:33:40 +02:00
HENRY Benjamin
74f85373ac added some ui in resumelobbyscene 2021-06-18 16:12:01 +02:00
EternalRat
a19536f389 parser done? (need to test a lot) 2021-06-18 15:49:05 +02:00
arthur.jamet
f23a58a616 add backgrounds 2021-06-18 11:50:23 +02:00
Clément Le Bihan
dbf1d4e213 fixing warnings 2021-06-18 11:21:32 +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
6616a99c04 fixed another possible issue 2021-06-16 15:54:43 +02:00
EternalRat
2ed5b79cfc added speed to the save 2021-06-16 11:47:46 +02:00
HENRY Benjamin
cdfa4a4b03 parser & resume game finish 2021-06-16 10:40:50 +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