Commit Graph

157 Commits

Author SHA1 Message Date
98b783ab76 fix: upload image 2024-01-28 13:25:17 +01:00
92337afda7 style: newline 2024-01-28 13:02:45 +01:00
a65e04673e fix: readd id question 2024-01-28 12:57:15 +01:00
4d0a84b6be Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 12:55:38 +01:00
3625e36f88 feat: new algo questions 2024-01-28 12:54:57 +01:00
Morgan - 6 Freedom
3df6b5381f room has current question id as string 2024-01-28 12:14:09 +01:00
Morgan - 6 Freedom
146a80c4e9 can get first or second proposition 2024-01-28 11:56:16 +01:00
Morgan - 6 Freedom
6e57cf8bfb questions havve id now 2024-01-28 11:46:24 +01:00
Morgan - 6 Freedom
f254c044e8 Update RoomManager.cs 2024-01-28 03:10:34 +01:00
Morgan - 6 Freedom
86dd6bcdaf Revert "revert"
This reverts commit 1e97dc0182.
2024-01-28 03:10:17 +01:00
1e97dc0182 revert 2024-01-28 03:08:39 +01:00
c84cb35bfe Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 03:06:42 +01:00
Morgan - 6 Freedom
7a0d03544f Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-28 03:06:32 +01:00
45481598a1 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 03:06:31 +01:00
ba9f081894 fix: algo generatePrompts 2024-01-28 03:06:28 +01:00
Morgan - 6 Freedom
61c9a5ba4a Generate prompts + lots of debug log 2024-01-28 03:06:26 +01:00
d15c0f3949 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 03:05:36 +01:00
5cfb75d135 fix: list by default on waiting 2024-01-28 03:05:29 +01:00
3a07cbf9b7 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 02:59:32 +01:00
fd251f22a9 fix: webcam 2024-01-28 02:59:30 +01:00
Otaku9999
82ce0a92f4 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-28 02:56:18 +01:00
1e53eb3ae5 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 02:53:14 +01:00
4b86bf43b5 fix: Forgot to initialize gamemanager 2024-01-28 02:53:11 +01:00
40cd75f8b4 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 02:52:45 +01:00
Otaku9999
481b5b196c Buzzer 2024-01-28 02:52:41 +01:00
fc103f8fab EndSamePlayer new players 2024-01-28 02:52:40 +01:00
e43ecb338f fix: camera issue when no camera 2024-01-28 02:48:34 +01:00
Morgan - 6 Freedom
c0d6aaef98 fix: missing scene 2024-01-28 02:42:31 +01:00
Morgan - 6 Freedom
388048553d fix: updateRoom 2024-01-28 02:42:03 +01:00
Morgan - 6 Freedom
68a056b3a1 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-28 02:41:25 +01:00
Morgan - 6 Freedom
09f06fb715 feat: waiting for all propositions on PC & add some SFX 2024-01-28 02:41:16 +01:00
532d66e1c1 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 02:40:47 +01:00
Morgan - 6 Freedom
a19f158828 feat: room has now a function to list player and get propositions 2024-01-28 02:40:38 +01:00
608926e0f5 feat: starting to work on upload file 2024-01-28 02:40:12 +01:00
Otaku9999
39603d26dc Music voting session 2024-01-28 02:38:31 +01:00
a9fd87527e feat: add GetPropositionsByPlayer 2024-01-28 02:26:57 +01:00
b04804c677 fix: have preivous players 2024-01-28 02:10:40 +01:00
fa47e8fb8c merge branch 2024-01-28 01:56:12 +01:00
edf23fe41f fix: begin state 2024-01-28 01:55:35 +01:00
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
Morgan - 6 Freedom
684c4f98af fix(counter): 3..2..1 is good sfx 2024-01-28 01:49:17 +01:00
1df95d8eca refacto: remove double Game Manager 2024-01-28 01:19:02 +01:00
fd97887dd7 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 01:16:57 +01:00
ecfcbbae41 refacto: move CameraManager again 2024-01-28 01:16:53 +01:00
2bfe662435 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 01:15:29 +01:00
e9170a96e4 Test is first 2024-01-28 01:15:05 +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