121 Commits

Author	SHA1	Message	Date
Fangh	28e03f2395	add audiomanager	2024-01-28 15:42:54 +01:00
Fangh	d84d18ba63	Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi	2024-01-28 15:14:46 +01:00
Fangh	c9501ce1b0	merge	2024-01-28 15:14:42 +01:00
Marine	b7eb576962	design score player	2024-01-28 15:10:36 +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	c33825d600	users can vote	2024-01-28 13:18:40 +01:00
Michel Roux	3625e36f88	feat: new algo questions	2024-01-28 12:54:57 +01:00
Morgan - 6 Freedom	c0d6aaef98	fix: missing scene	2024-01-28 02:42:31 +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	fa47e8fb8c	merge branch	2024-01-28 01:56:12 +01:00
Marine	a1b5c59197	fix: eror in scene not reference	2024-01-28 01:54:41 +01:00
Morgan - 6 Freedom	f7dcf0ce0d	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-28 01:49:42 +01:00
Morgan - 6 Freedom	781b7d88c9	fix(playerjoin): player are displayed in the correct order	2024-01-28 01:49:40 +01:00
Michel Roux	1df95d8eca	refacto: remove double Game Manager	2024-01-28 01:19:02 +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
Morgan - 6 Freedom	e876034c80	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-28 01:03:24 +01:00
Morgan - 6 Freedom	64596bcb9e	fix: proposition counter	2024-01-28 01:03:16 +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	e994fd7f4e	feat: Move GameManager to Managers	2024-01-28 00:32:01 +01:00
Michel Roux	5e207ddae7	fix: no camera no flood	2024-01-28 00:21:38 +01:00
Michel Roux	97860e4232	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 00:07:29 +01:00
Marine	7d5f106320	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-28 00:07:08 +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
Michel Roux	5d75c6b827	fix: Move nearly all managers on Managers	2024-01-28 00:04:18 +01:00
Otaku9999	57cf69a5b3	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 23:27:34 +01:00
Otaku9999	599c1cda06	Icones	2024-01-27 23:27:29 +01:00
Morgan - 6 Freedom	9da2198871	add logo	2024-01-27 23:12:47 +01:00
Morgan - 6 Freedom	e13f094914	explanation page on PC	2024-01-27 23:07:41 +01:00
Morgan - 6 Freedom	b03d51c06c	refacto roommanager	2024-01-27 22:24:50 +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	1bf8031f5c	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 18:46:36 +01:00
Morgan - 6 Freedom	787c090621	add logo to scene	2024-01-27 18:46:32 +01:00
Morgan - 6 Freedom	9788da9e7f	rework room connect state	2024-01-27 18:45:15 +01:00
Michel Roux	14f57134d2	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 18:24:01 +01:00
Michel Roux	a8c205effb	chore: Remove old CameraView scene	2024-01-27 18:23:58 +01:00
Marine	609ec22957	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 18:18:13 +01:00
Marine	b49d1a686b	fix btn interactable	2024-01-27 18:18:03 +01:00
Michel Roux	68ee3cf1ef	fix: PhoneView again	2024-01-27 18:12:56 +01:00
Michel Roux	5743d4cacc	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 18:11:12 +01:00
Michel Roux	2bf575b3b7	fix: Update PhoneView	2024-01-27 18:11:02 +01:00
Marine	78c40dd9d5	player connected	2024-01-27 17:56:03 +01:00
Michel Roux	1de9e63770	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 16:39:12 +01:00
Michel Roux	a07aa506b4	feat: webcam working	2024-01-27 16:39:10 +01:00
Marine	8b035e6a30	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 16:26:05 +01:00
Marine	c776bbf9a5	connect UI	2024-01-27 16:25:53 +01:00
Michel Roux	5a39339251	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 15:22:49 +01:00
Michel Roux	95665b2aab	feat: webcam crop	2024-01-27 15:22:45 +01:00
Morgan - 6 Freedom	6375f4a34f	we can create rooms	2024-01-27 15:08:12 +01:00
Marine	31f9e1415e	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 13:44:02 +01:00
Marine	71b048749c	phoneView	2024-01-27 13:43:40 +01:00
Michel Roux	af7bd2eb95	feat: webcam buttons	2024-01-27 13:39:18 +01:00
Michel Roux	ccd98edd53	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 12:33:35 +01:00
Michel Roux	db1c510f01	feat: webcam	2024-01-27 12:31:58 +01:00
Morgan - 6 Freedom	c33e91f30d	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 12:25:41 +01:00
Morgan - 6 Freedom	fe7ca5c604	Prompt can be saved and loaded	2024-01-27 12:24:47 +01:00
Michel Roux	12608da0c5	feat: broken webcam	2024-01-27 11:26:34 +01:00
Marine	eb59940db2	computerview1	2024-01-27 00:34:06 +01:00
Marine	6d4839ed01	players labels	2024-01-27 00:00:26 +01:00
Marine	48e16e75f9	UI + config	2024-01-26 23:07:49 +01:00
Marine	c734239f7d	first commit	2024-01-26 21:46:57 +01:00