44 Commits

Author	SHA1	Message	Date
Benjamin HENRY	93c8fb1192	Merge branch 'develop' into parser	2021-06-17 21:54:54 +02:00
Zoe Roux	03f3d25d00	Merge pull request #191 from AnonymusRaccoon/update_texture ... Update texture	2021-06-17 14:57:09 +02:00
Clément Le Bihan	2e630f981f	Merge pull request #185 from AnonymusRaccoon/fix_player_death ... Fix player death	2021-06-17 14:50:46 +02:00
Askou	991b77ad04	Merge branch 'develop' of github.com:AnonymusRaccoon/Bomberman into update_texture	2021-06-17 14:49:19 +02:00
Arthi-chaud	685f661de2	Merge pull request #188 from AnonymusRaccoon/new_win_size ... UI Improvement (Vol. 2)	2021-06-17 14:42:34 +02:00
HENRY Benjamin	238a188487	merged with develop	2021-06-17 14:41:34 +02:00
HENRY Benjamin	4e306581de	the player now see the bomb explosion before dying of it	2021-06-17 14:34:29 +02:00
Bluub	80013ddb41	merge develop	2021-06-17 12:47:14 +02:00
arthur.jamet	f0b6b59428	fix tile position ingame	2021-06-17 12:25:35 +02:00
arthur.jamet	1992f54a74	fire up ui: now displayed in int	2021-06-17 12:14:06 +02:00
Askou	6f9609a2f2	fix player heigth	2021-06-17 11:18:42 +02:00
HENRY Benjamin	c601754c44	fixed an issue about the resume lobby	2021-06-17 10:51:41 +02:00
Bluub	09ad8b4efd	ai scripts in assets	2021-06-16 18:56:49 +02:00
Zoe Roux	847e004980	Merging with develop	2021-06-16 17:38:59 +02:00
arthur.jamet	2956f7519f	merge from develop	2021-06-16 17:37:23 +02:00
Clément Le Bihan	19a3eafebb	fixing update display	2021-06-16 17:10:26 +02:00
Clément Le Bihan	fcffbdca6d	fixing update display	2021-06-16 17:10:07 +02:00
arthur.jamet	65dda46918	stat displays, no update	2021-06-16 16:47:19 +02:00
arthur.jamet	1f639fec98	stat displays, no update	2021-06-16 16:36:42 +02:00
arthur.jamet	a11eef468c	display simpe stat, no update	2021-06-16 16:32:07 +02:00
arthur.jamet	b81fefc4e0	add squares to hide bonus in ui tile	2021-06-16 13:55:55 +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	856809d9c0	Fixing p	2021-06-15 18:00:37 +02:00
Zoe Roux	0533796f63	Adding ai holders	2021-06-15 16:35:04 +02:00
Bluub	35d07117a7	merge lobby	2021-06-15 16:28:29 +02:00
Zoe Roux	404c5d3d57	Adding AIs buttons	2021-06-15 16:09:47 +02:00
arthur.jamet	7f22d3279c	add tile in ui	2021-06-15 15:57:59 +02:00
arthur.jamet	ca400d7c6b	add ui on game	2021-06-15 15:36:55 +02:00
Zoe Roux	123fe91080	Renaming the select button	2021-06-15 14:03:07 +02:00
Zoe Roux	01457a0cd5	Clearing the lobby on leave	2021-06-15 12:19:40 +02:00
Zoe Roux	86e25d2b94	Merging with develop	2021-06-14 17:50:07 +02:00
Zoe Roux	2f0150c098	Fixing players starting position	2021-06-14 17:42:26 +02:00
Zoe Roux	b204f48059	Adding colors to players	2021-06-14 17:21:10 +02:00
Zoe Roux	9b385349dc	Trying things.	2021-06-14 16:00:41 +02:00
Zoe Roux	60a5ad0ded	Allowing the game to be started	2021-06-14 13:36:11 +02:00
Zoe Roux	a42ca68595	Fixing play button and menu handling	2021-06-14 11:39:00 +02:00
Zoe Roux	de579ccda6	Handling ready buttons	2021-06-14 10:42:50 +02:00
Zoe Roux	fb1cfa3654	Adding ready handling for players	2021-06-11 15:32:49 +02:00
Zoe Roux	ccde7a9879	Allowing players to join the lobby	2021-06-11 12:15:51 +02:00
Zoe Roux	804361c763	Adding a lobby system	2021-06-11 11:31:31 +02:00
arthur.jamet	a2e637d668	icons for lobby	2021-06-11 11:03:19 +02:00
arthur.jamet	dc453362a8	lobby system: player connected texture update	2021-06-11 10:47:23 +02:00
arthur.jamet	5878dd46f4	first commit on branch	2021-06-10 12:01:35 +02:00