174 Commits

Author	SHA1	Message	Date
Morgan - 6 Freedom	a2e2eb5898	fix(roommanager): deserialize dictionnary and not list of rooms	2024-01-27 21:27:17 +01:00
Michel Roux	032bc974bf	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 21:07:51 +01:00
Michel Roux	96bc36cf5e	style: refacto	2024-01-27 21:07:49 +01:00
Morgan - 6 Freedom	65ebad88cb	fix(connection): when there is no room	2024-01-27 21:07:17 +01:00
Michel Roux	94c3daa525	style: cleaning import	2024-01-27 20:05:24 +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	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	695524eb06	fix error on merge	2024-01-27 18:10:17 +01:00
Michel Roux	bff9a36fce	fix: use OnEnable/OnDisable on CameraManager	2024-01-27 18:09:40 +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
Michel Roux	7fd4657e81	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 17:54:07 +01:00
Michel Roux	249121e775	feat: webcam memory leak fixed	2024-01-27 17:54:03 +01:00
Otaku9999	0383ae9d1b	Full prompt	2024-01-27 17:21:03 +01:00
Otaku9999	c9923f789a	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 17:14:06 +01:00
Otaku9999	45cf7529fb	50 prompt	2024-01-27 17:14:00 +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
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
Marine	d0dbe7842a	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 16:26:55 +01:00
Otaku9999	7ceb0a1c58	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 16:26:14 +01:00
Otaku9999	bab28a7c83	About half	2024-01-27 16:26:06 +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
Morgan - 6 Freedom	449c0829ae	room can create a unique code	2024-01-27 15:54:23 +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
Morgan - 6 Freedom	2620d91331	fix authentication	2024-01-27 14:51:34 +01:00
Morgan - 6 Freedom	ea295d0325	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 13:47:11 +01:00
Morgan - 6 Freedom	01804c4724	GameManager WIP	2024-01-27 13:46:54 +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	f6b5408275	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 13:39:27 +01:00
Michel Roux	af7bd2eb95	feat: webcam buttons	2024-01-27 13:39:18 +01:00
Morgan - 6 Freedom	c8b7b702d7	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 13:19:59 +01:00
Morgan - 6 Freedom	7cd731697a	WIP of room manager	2024-01-27 13:19:56 +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	2b5d594f8a	new name of app for android	2024-01-27 12:25:08 +01:00
Morgan - 6 Freedom	fe7ca5c604	Prompt can be saved and loaded	2024-01-27 12:24:47 +01:00
Michel Roux	76621dfb6e	feat: add Firebase	2024-01-27 11:27:39 +01:00
Michel Roux	12608da0c5	feat: broken webcam	2024-01-27 11:26:34 +01:00
Morgan - 6 Freedom	85ebcb4508	Update android resolvers	2024-01-27 10:20:02 +01:00
Morgan - 6 Freedom	cbd7c95ddd	Merge branch 'main' of https://github.com/LeGall29/GGJ2024	2024-01-27 10:19:36 +01:00
Morgan - 6 Freedom	d6af38c644	database classes	2024-01-27 10:19:32 +01:00
Michel Roux	d02f240e45	chore: remove useless meta	2024-01-27 09:24:38 +01:00
Marine	eb59940db2	computerview1	2024-01-27 00:34:06 +01:00
Marine	a5b2c1032b	Merge branch 'main' of github.com:LeGall29/GGJ2024	2024-01-27 00:03:31 +01:00
Marine	6d4839ed01	players labels	2024-01-27 00:00:26 +01:00
Michel Roux	b6865b3c54	feat: add Firebase Initializer	2024-01-26 23:51:40 +01:00
Marine	99b350a934	Remove textmesh pro examples	2024-01-26 23:11:23 +01:00
Marine	48e16e75f9	UI + config	2024-01-26 23:07:49 +01:00
Michel Roux	c6439e3509	feat: add Firebase	2024-01-26 23:04:26 +01:00
Marine	c734239f7d	first commit	2024-01-26 21:46:57 +01:00