Commit Graph

Select branches

Hide Pull Requests

main

#19

0.1

0.3

Mono Color

• 61c9a5ba4a Generate prompts + lots of debug log Morgan - 6 Freedom 2024-01-28 03:06:26 +0100
• d15c0f3949 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-28 03:05:36 +0100
• 5cfb75d135 fix: list by default on waiting Marine 2024-01-28 03:05:29 +0100
• 3a07cbf9b7 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-28 02:59:32 +0100
• fd251f22a9 fix: webcam Michel Roux 2024-01-28 02:59:30 +0100
• 82ce0a92f4 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Otaku9999 2024-01-28 02:56:18 +0100
• 1e53eb3ae5 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-28 02:53:14 +0100
• 4b86bf43b5 fix: Forgot to initialize gamemanager Michel Roux 2024-01-28 02:53:11 +0100
• 40cd75f8b4 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-28 02:52:45 +0100
• 481b5b196c Buzzer Otaku9999 2024-01-28 02:52:41 +0100
• fc103f8fab EndSamePlayer new players Marine 2024-01-28 02:52:40 +0100
• e43ecb338f fix: camera issue when no camera Michel Roux 2024-01-28 02:48:34 +0100
• c0d6aaef98 fix: missing scene Morgan - 6 Freedom 2024-01-28 02:42:31 +0100
• 388048553d fix: updateRoom Morgan - 6 Freedom 2024-01-28 02:42:03 +0100
• 68a056b3a1 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-28 02:41:25 +0100
• 09f06fb715 feat: waiting for all propositions on PC & add some SFX Morgan - 6 Freedom 2024-01-28 02:41:16 +0100
• 532d66e1c1 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-28 02:40:47 +0100
• a19f158828 feat: room has now a function to list player and get propositions Morgan - 6 Freedom 2024-01-28 02:40:38 +0100
• 608926e0f5 feat: starting to work on upload file Michel Roux 2024-01-28 02:40:12 +0100
• 39603d26dc Music voting session Otaku9999 2024-01-28 02:38:31 +0100
• a9fd87527e feat: add GetPropositionsByPlayer Michel Roux 2024-01-28 02:26:57 +0100
• b04804c677 fix: have preivous players Marine 2024-01-28 02:10:40 +0100
• fa47e8fb8c merge branch Marine 2024-01-28 01:56:12 +0100
• edf23fe41f fix: begin state Marine 2024-01-28 01:55:35 +0100
• a1b5c59197 fix: eror in scene not reference Marine 2024-01-28 01:54:41 +0100
• f7dcf0ce0d Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-28 01:49:42 +0100
• 781b7d88c9 fix(playerjoin): player are displayed in the correct order Morgan - 6 Freedom 2024-01-28 01:49:40 +0100
• 684c4f98af fix(counter): 3..2..1 is good sfx Morgan - 6 Freedom 2024-01-28 01:49:17 +0100
• 1df95d8eca refacto: remove double Game Manager Michel Roux 2024-01-28 01:19:02 +0100
• fd97887dd7 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-28 01:16:57 +0100
• ecfcbbae41 refacto: move CameraManager again Michel Roux 2024-01-28 01:16:53 +0100
• 2bfe662435 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-28 01:15:29 +0100
• e9170a96e4 Test is first Marine 2024-01-28 01:15:05 +0100
• e876034c80 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-28 01:03:24 +0100
• 64596bcb9e fix: proposition counter Morgan - 6 Freedom 2024-01-28 01:03:16 +0100
• 4b20bfd11f merge branch Marine 2024-01-28 01:01:34 +0100
• b59ab36b7d fix: phoneView change state Marine 2024-01-28 00:59:12 +0100
• e994fd7f4e feat: Move GameManager to Managers Michel Roux 2024-01-28 00:32:01 +0100
• 5e207ddae7 fix: no camera no flood Michel Roux 2024-01-28 00:21:38 +0100
• 97860e4232 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-28 00:07:29 +0100
• 7d5f106320 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-28 00:07:08 +0100
• 723d0d14d2 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-28 00:06:50 +0100
• 140652da82 Go to make picture room Marine 2024-01-28 00:06:41 +0100
• 8c5e7767d0 (fix): explanation page is working Morgan - 6 Freedom 2024-01-28 00:06:23 +0100
• 5d75c6b827 fix: Move nearly all managers on Managers Michel Roux 2024-01-28 00:04:18 +0100
• d7eb0c52d9 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Otaku9999 2024-01-28 00:03:16 +0100
• ad324a1ed4 End music Otaku9999 2024-01-28 00:03:13 +0100
• 52364100ed Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-27 23:51:33 +0100
• 8519964e06 update current state + sendExplanation Marine 2024-01-27 23:50:57 +0100
• b37a06faab Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-27 23:47:32 +0100
• 6deff961d4 fix: currentstate is no more global Morgan - 6 Freedom 2024-01-27 23:47:31 +0100
• 4f23f34497 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 23:47:18 +0100
• e6a8387a82 test: Storage PT Michel Roux 2024-01-27 23:47:06 +0100
• 57cf69a5b3 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Otaku9999 2024-01-27 23:27:34 +0100
• 599c1cda06 Icones Otaku9999 2024-01-27 23:27:29 +0100
• 9da2198871 add logo Morgan - 6 Freedom 2024-01-27 23:12:47 +0100
• e13f094914 explanation page on PC Morgan - 6 Freedom 2024-01-27 23:07:41 +0100
• 927e0dfbb9 fix: add creationDate on proposition Michel Roux 2024-01-27 23:05:27 +0100
• c8272c0b99 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 23:00:07 +0100
• 5130a1dc4b feat: generatePrompt Michel Roux 2024-01-27 22:55:04 +0100
• b834a2128d Restart Otaku9999 2024-01-27 22:49:32 +0100
• 4ee8c39805 One two three Otaku9999 2024-01-27 22:42:41 +0100
• 9cb3bfdfd1 Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Otaku9999 2024-01-27 22:38:12 +0100
• 2a627b9f81 Son + Logo Otaku9999 2024-01-27 22:38:08 +0100
• 8e77f1cb13 update GameState Marine 2024-01-27 22:33:42 +0100
• f6ab405393 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-27 22:26:35 +0100
• 762c05fa6c add crea date + room state Marine 2024-01-27 22:26:23 +0100
• b03d51c06c refacto roommanager Morgan - 6 Freedom 2024-01-27 22:24:50 +0100
• a2e2eb5898 fix(roommanager): deserialize dictionnary and not list of rooms Morgan - 6 Freedom 2024-01-27 21:27:17 +0100
• 032bc974bf Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 21:07:51 +0100
• 96bc36cf5e style: refacto Michel Roux 2024-01-27 21:07:49 +0100
• 65ebad88cb fix(connection): when there is no room Morgan - 6 Freedom 2024-01-27 21:07:17 +0100
• 94c3daa525 style: cleaning import Michel Roux 2024-01-27 20:05:24 +0100
• bb45f55ece fix: merge Michel Roux 2024-01-27 20:01:45 +0100
• fbf4dac1c0 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 19:59:51 +0100
• fa81bb5895 feat: StorageManager Michel Roux 2024-01-27 19:58:02 +0100
• b5c547bd06 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-27 19:57:21 +0100
• 2986fc52a2 Ui fixes Marine 2024-01-27 19:57:11 +0100
• df6c4f08c9 players can join room Morgan - 6 Freedom 2024-01-27 19:54:06 +0100
• a21f360440 merge branch Marine 2024-01-27 18:53:31 +0100
• 3ed3dc31dd correct user connect room Marine 2024-01-27 18:50:04 +0100
• 1bf8031f5c Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Morgan - 6 Freedom 2024-01-27 18:46:36 +0100
• 787c090621 add logo to scene Morgan - 6 Freedom 2024-01-27 18:46:32 +0100
• 9788da9e7f rework room connect state Morgan - 6 Freedom 2024-01-27 18:45:15 +0100
• 14f57134d2 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 18:24:01 +0100
• a8c205effb chore: Remove old CameraView scene Michel Roux 2024-01-27 18:23:58 +0100
• 609ec22957 Merge branch 'main' of github.com:LeGall29/GGJ2024 Marine 2024-01-27 18:18:13 +0100
• b49d1a686b fix btn interactable Marine 2024-01-27 18:18:03 +0100
• 68ee3cf1ef fix: PhoneView again Michel Roux 2024-01-27 18:12:56 +0100
• 5743d4cacc Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 18:11:12 +0100
• 2bf575b3b7 fix: Update PhoneView Michel Roux 2024-01-27 18:11:02 +0100
• 695524eb06 fix error on merge Marine 2024-01-27 18:10:17 +0100
• bff9a36fce fix: use OnEnable/OnDisable on CameraManager Michel Roux 2024-01-27 18:09:40 +0100
• 530cca0be2 merge conflict Marine 2024-01-27 17:59:12 +0100
• 78c40dd9d5 player connected Marine 2024-01-27 17:56:03 +0100
• cd659d87d5 player really join rooms Morgan - 6 Freedom 2024-01-27 17:54:37 +0100
• 7fd4657e81 Merge branch 'main' of github.com:LeGall29/GGJ2024 Michel Roux 2024-01-27 17:54:07 +0100
• 249121e775 feat: webcam memory leak fixed Michel Roux 2024-01-27 17:54:03 +0100
• 0383ae9d1b Full prompt Otaku9999 2024-01-27 17:21:03 +0100
• c9923f789a Merge branch 'main' of https://github.com/LeGall29/GGJ2024 Otaku9999 2024-01-27 17:14:06 +0100