19 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
Zoe Roux	000528ba14	Fixing #228	2021-06-18 16:07:40 +02:00
HENRY Benjamin	c601754c44	fixed an issue about the resume lobby	2021-06-17 10:51:41 +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
arthur.jamet	ca400d7c6b	add ui on game	2021-06-15 15:36:55 +02:00
arthur.jamet	af599fac0f	add how to play scene	2021-06-15 14:59:45 +02:00
arthur.jamet	005ddecf53	end condition: change scene only if scene has a player	2021-06-15 11:28:24 +02:00
arthur.jamet	a2a686cdc7	add time component	2021-06-15 10:53:59 +02:00
arthur.jamet	0a0501a044	splash screen has a scene on its own	2021-06-11 20:13:27 +02:00
arthur.jamet	3948b5f94c	credit scene	2021-06-08 20:15:11 +02:00
arthur.jamet	036ecb960e	when one change the current scene, menu controllable system update current button to use	2021-06-08 11:39:58 +02:00
arthur.jamet	d0d5935ae1	some things for the menu scene	2021-06-07 11:52:03 +02:00
arthur.jamet	39a1739a26	better name for title screen scene	2021-06-05 12:20:02 +02:00
arthur.jamet	f9c46d2120	add splashcreen scene in game states	2021-06-05 10:34:11 +02:00
arthur.jamet	e34c838da9	add hold callback on button	2021-06-04 17:03:24 +02:00
arthur.jamet	1f42e7d911	more scenes ID	2021-06-04 16:58:30 +02:00
Zoe Roux	6deade8ddc	Fixing namespace	2021-05-24 17:15:24 +02:00
Zoe Roux	54fe800549	Adding a state and scene utils	2021-05-24 14:59:28 +02:00