Commit Graph

102 Commits

Author SHA1 Message Date
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
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
fd251f22a9 fix: webcam 2024-01-28 02:59:30 +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
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
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
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
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
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
4b20bfd11f merge branch 2024-01-28 01:01:34 +01:00
b59ab36b7d fix: phoneView change state 2024-01-28 00:59:12 +01:00
e994fd7f4e feat: Move GameManager to Managers 2024-01-28 00:32:01 +01:00
5e207ddae7 fix: no camera no flood 2024-01-28 00:21:38 +01:00
97860e4232 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 00:07:29 +01:00
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
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
5d75c6b827 fix: Move nearly all managers on Managers 2024-01-28 00:04:18 +01:00
52364100ed Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 23:51:33 +01:00
8519964e06 update current state + sendExplanation 2024-01-27 23:50:57 +01:00
Morgan - 6 Freedom
b37a06faab Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-27 23:47:32 +01:00
Morgan - 6 Freedom
6deff961d4 fix: currentstate is no more global 2024-01-27 23:47:31 +01:00
e6a8387a82 test: Storage PT 2024-01-27 23:47:06 +01:00
Morgan - 6 Freedom
e13f094914 explanation page on PC 2024-01-27 23:07:41 +01:00
927e0dfbb9 fix: add creationDate on proposition 2024-01-27 23:05:27 +01:00
c8272c0b99 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 23:00:07 +01:00
5130a1dc4b feat: generatePrompt 2024-01-27 22:55:04 +01:00
8e77f1cb13 update GameState 2024-01-27 22:33:42 +01:00
f6ab405393 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 22:26:35 +01:00
762c05fa6c add crea date + room state 2024-01-27 22:26:23 +01:00