12 Commits

Author SHA1 Message Date
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 41e1becdeb fixing small issues 2021-06-18 20:08:34 +02:00
Zoe Roux a55b1543c9 Adding a restart timer when resuming the game 2021-06-18 17:56:34 +02:00
Zoe Roux a253578d8a Fixing the timer ui system 2021-06-18 15:53:20 +02:00
Zoe Roux d424c07744 Finishing the replay button 2021-06-17 22:31:21 +02:00
arthur.jamet 060f6846cd format timer 2021-06-17 17:45:33 +02:00
arthur.jamet b1720ffd79 remove unused namespace 2021-06-16 17:12:34 +02:00
arthur.jamet a477ef1252 timer system for ui 2021-06-16 13:26:48 +02:00
arthur.jamet cbd2f5496d add timer ingame 2021-06-16 10:15:13 +02:00
Zoe Roux e0683c0df0 Trying to merge with develop 2021-06-07 14:40:24 +02:00
Zoe Roux 9dca04e385 Making bomb explose 2021-06-01 15:33:32 +02:00
Zoe Roux 1cf2a9ee9f Creating the timer system 2021-05-31 17:28:56 +02:00