Commit Graph

152 Commits

Author SHA1 Message Date
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
Otaku9999
d7eb0c52d9 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-28 00:03:16 +01:00
Otaku9999
ad324a1ed4 End music 2024-01-28 00:03:13 +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
4f23f34497 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 23:47:18 +01:00
e6a8387a82 test: Storage PT 2024-01-27 23:47:06 +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
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
Otaku9999
b834a2128d Restart 2024-01-27 22:49:32 +01:00
Otaku9999
4ee8c39805 One two three 2024-01-27 22:42:41 +01:00
Otaku9999
9cb3bfdfd1 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 2024-01-27 22:38:12 +01:00
Otaku9999
2a627b9f81 Son + Logo 2024-01-27 22:38:08 +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
Morgan - 6 Freedom
b03d51c06c refacto roommanager 2024-01-27 22:24:50 +01:00
Morgan - 6 Freedom
a2e2eb5898 fix(roommanager): deserialize dictionnary and not list of rooms 2024-01-27 21:27:17 +01:00
032bc974bf Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 21:07:51 +01:00
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
94c3daa525 style: cleaning import 2024-01-27 20:05:24 +01:00
bb45f55ece fix: merge 2024-01-27 20:01:45 +01:00
fbf4dac1c0 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 19:59:51 +01:00
fa81bb5895 feat: StorageManager 2024-01-27 19:58:02 +01:00
b5c547bd06 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 19:57:21 +01:00
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
a21f360440 merge branch 2024-01-27 18:53:31 +01:00
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
14f57134d2 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 18:24:01 +01:00
a8c205effb chore: Remove old CameraView scene 2024-01-27 18:23:58 +01:00
609ec22957 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 18:18:13 +01:00
b49d1a686b fix btn interactable 2024-01-27 18:18:03 +01:00
68ee3cf1ef fix: PhoneView again 2024-01-27 18:12:56 +01:00
5743d4cacc Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-27 18:11:12 +01:00
2bf575b3b7 fix: Update PhoneView 2024-01-27 18:11:02 +01:00
695524eb06 fix error on merge 2024-01-27 18:10:17 +01:00