53 Commits

Author	SHA1	Message	Date
Marine	5e58f33ea1	fix merge	2024-01-28 17:36:00 +01:00
Marine	f7a883d539	push voters when click	2024-01-28 17:07:57 +01:00
Marine	d668c99a57	assets + playerVote + change state	2024-01-28 16:43:01 +01:00
Fangh	c8bf4e8182	credits & funny texts & playerprefs	2024-01-28 15:09:28 +01:00
Marine	2b604fdb80	Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi	2024-01-28 14:43:23 +01:00
Marine	4735c12e74	feat: chrono takepicture + design computerview	2024-01-28 14:43:15 +01:00
Morgan - 6 Freedom	3df6b5381f	room has current question id as string	2024-01-28 12:14:09 +01:00
Marine	5cfb75d135	fix: list by default on waiting	2024-01-28 03:05:29 +01:00
Marine	40cd75f8b4	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 02:52:45 +01:00
Marine	fc103f8fab	EndSamePlayer new players	2024-01-28 02:52:40 +01:00
Michel Roux	532d66e1c1	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 02:40:47 +01:00
Michel Roux	608926e0f5	feat: starting to work on upload file	2024-01-28 02:40:12 +01:00
Marine	b04804c677	fix: have preivous players	2024-01-28 02:10:40 +01:00
Marine	fa47e8fb8c	merge branch	2024-01-28 01:56:12 +01:00
Marine	edf23fe41f	fix: begin state	2024-01-28 01:55:35 +01:00
Michel Roux	fd97887dd7	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 01:16:57 +01:00
Michel Roux	ecfcbbae41	refacto: move CameraManager again	2024-01-28 01:16:53 +01:00
Marine	e9170a96e4	Test is first	2024-01-28 01:15:05 +01:00
Marine	4b20bfd11f	merge branch	2024-01-28 01:01:34 +01:00
Marine	b59ab36b7d	fix: phoneView change state	2024-01-28 00:59:12 +01:00
Michel Roux	5e207ddae7	fix: no camera no flood	2024-01-28 00:21:38 +01:00
Marine	7d5f106320	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 00:07:08 +01:00
Morgan - 6 Freedom	723d0d14d2	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-28 00:06:50 +01:00
Marine	140652da82	Go to make picture room	2024-01-28 00:06:41 +01:00
Morgan - 6 Freedom	8c5e7767d0	(fix): explanation page is working	2024-01-28 00:06:23 +01:00
Marine	52364100ed	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 23:51:33 +01:00
Marine	8519964e06	update current state + sendExplanation	2024-01-27 23:50:57 +01:00
Michel Roux	c8272c0b99	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 23:00:07 +01:00
Michel Roux	5130a1dc4b	feat: generatePrompt	2024-01-27 22:55:04 +01:00
Marine	8e77f1cb13	update GameState	2024-01-27 22:33:42 +01:00
Marine	f6ab405393	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 22:26:35 +01:00
Marine	762c05fa6c	add crea date + room state	2024-01-27 22:26:23 +01:00
Morgan - 6 Freedom	b03d51c06c	refacto roommanager	2024-01-27 22:24:50 +01:00
Michel Roux	96bc36cf5e	style: refacto	2024-01-27 21:07:49 +01:00
Michel Roux	bb45f55ece	fix: merge	2024-01-27 20:01:45 +01:00
Michel Roux	fbf4dac1c0	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 19:59:51 +01:00
Michel Roux	fa81bb5895	feat: StorageManager	2024-01-27 19:58:02 +01:00
Marine	b5c547bd06	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 19:57:21 +01:00
Marine	2986fc52a2	Ui fixes	2024-01-27 19:57:11 +01:00
Morgan - 6 Freedom	df6c4f08c9	players can join room	2024-01-27 19:54:06 +01:00
Marine	a21f360440	merge branch	2024-01-27 18:53:31 +01:00
Marine	3ed3dc31dd	correct user connect room	2024-01-27 18:50:04 +01:00
Morgan - 6 Freedom	9788da9e7f	rework room connect state	2024-01-27 18:45:15 +01:00
Marine	b49d1a686b	fix btn interactable	2024-01-27 18:18:03 +01:00
Marine	695524eb06	fix error on merge	2024-01-27 18:10:17 +01:00
Marine	530cca0be2	merge conflict	2024-01-27 17:59:12 +01:00
Marine	78c40dd9d5	player connected	2024-01-27 17:56:03 +01:00
Morgan - 6 Freedom	cd659d87d5	player really join rooms	2024-01-27 17:54:37 +01:00
Morgan - 6 Freedom	9c00e5379e	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 16:32:58 +01:00
Morgan - 6 Freedom	9d8019556c	player can connect WIP	2024-01-27 16:32:12 +01:00