Commit Graph

333 Commits

Author SHA1 Message Date
Fangh
dec3b18a0e rework wait for proposition page 2024-01-29 19:32:07 +01:00
Fangh
c63583fea1 delete unused scene 2024-01-29 19:03:39 +01:00
Fangh
6122b747de fix: currentQuestion => currentQuestionId 2024-01-28 23:04:14 +01:00
Fangh
f01d2e4227 fix(vote): questionID was converted to Quesiton object 2024-01-28 22:57:43 +01:00
Fangh
c09b3fb8f0 fix(ui): update some UI 2024-01-28 22:50:26 +01:00
Fangh
e27ad3fb40 fix: Vote one by one 2024-01-28 22:42:02 +01:00
Fangh
f533a4ba75 fix(vote): buttons were not referenced 2024-01-28 22:16:16 +01:00
Fangh
683e2d5de4 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 22:08:33 +01:00
Fangh
57d7b5d9f8 fix(imagedownloader): remove debug fonction 2024-01-28 22:08:27 +01:00
Fangh
a6e67d3b76 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 22:07:41 +01:00
Fangh
878a8d18fa feat(storagemanager): correctly convert GS url to http url 2024-01-28 22:07:34 +01:00
Fangh
25d4ff6e92 fix(cameramanager): webcamtexture sometime failed to initialize 2024-01-28 21:53:27 +01:00
Fangh
c952783c36 fix(firebase): force android resolver 2024-01-28 21:49:21 +01:00
Fangh
03158f21c9 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 21:37:53 +01:00
Fangh
e6b503e650 reskin connection phone view 2024-01-28 21:37:45 +01:00
Fangh
f1a50a1768 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 21:28:58 +01:00
Fangh
073e60757d fix(firebase): initialization was not done on main thread 2024-01-28 21:28:48 +01:00
Morgan Klein - 6freedom
fff24c72a4 build files 2024-01-28 20:31:02 +01:00
Fangh
b0ae9e077a Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 18:16:44 +01:00
Fangh
981213e6ae fix timer 2024-01-28 18:12:05 +01:00
3659035f0a fix: oups 2024-01-28 18:07:36 +01:00
Fangh
a8b7ae964c Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 17:54:20 +01:00
Fangh
015305131d fix 2024-01-28 17:54:19 +01:00
c25d8192df Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 17:54:05 +01:00
969709898f fix url 2024-01-28 17:54:04 +01:00
Fangh
7a6e711bb5 fix timer of vote 2024-01-28 17:53:37 +01:00
Fangh
869635c5cc fix things 2024-01-28 17:47:58 +01:00
2846ed7a1a url 2024-01-28 17:47:38 +01:00
e252204e80 debug 2024-01-28 17:46:36 +01:00
ed5dbae9bc Add comprnent 2024-01-28 17:45:56 +01:00
8a8dc229e6 zeoqihgehoiazgjoipzganjo+% 2024-01-28 17:38:08 +01:00
0e9e521bd2 grrrrrr 2024-01-28 17:37:34 +01:00
686b00b8d5 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 17:36:17 +01:00
5e58f33ea1 fix merge 2024-01-28 17:36:00 +01:00
e41f0d83d5 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 17:35:12 +01:00
65dfe37f96 fix: gamemanager 2024-01-28 17:35:11 +01:00
Fangh
81134390f7 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 17:34:21 +01:00
Fangh
93bd799a1b cleaner 2024-01-28 17:34:12 +01:00
4e2ce97cd2 feat: download image on proposition 2024-01-28 17:34:11 +01:00
b5e8c910a2 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 17:08:18 +01:00
f7a883d539 push voters when click 2024-01-28 17:07:57 +01:00
684e53d599 Copy DownloadImage 2024-01-28 17:07:54 +01:00
365615d226 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 17:06:00 +01:00
fa771c795e set img button to vote 2024-01-28 17:05:48 +01:00
Otaku9999
e51740400d Prompt + funny name 2024-01-28 16:58:43 +01:00
Fangh
8b48dc9462 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 16:52:21 +01:00
Fangh
0014a2a05d fix somes things 2024-01-28 16:52:13 +01:00
d36dad28bd Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 16:43:06 +01:00
d668c99a57 assets + playerVote + change state 2024-01-28 16:43:01 +01:00
fa70ac7288 gameManager not usefull 2024-01-28 16:39:05 +01:00
141b179a5f Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 16:36:38 +01:00
33d8281e04 fix: cameramanager 2024-01-28 16:36:37 +01:00
Fangh
1a724ac03c fix: manage when no propositions 2024-01-28 16:34:06 +01:00
0876f685d8 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 16:32:10 +01:00
a58a543514 Fix store manager 2024-01-28 16:32:09 +01:00
Fangh
56dbbc627f change dbeuglog 2024-01-28 16:28:19 +01:00
b3843ab76c fix: c'est pas logique de mettre enable avant start bordel 2024-01-28 16:28:04 +01:00
Fangh
7ab0ae9ac8 fix: if user has given no proposition 2024-01-28 16:23:53 +01:00
44a0a3fb39 test: debug 2024-01-28 16:19:30 +01:00
Fangh
f7338aaf93 List are converted to Discionnary 2024-01-28 16:13:25 +01:00
Fangh
f5a938f314 update music manager and fix voting page 2024-01-28 15:52:05 +01:00
Fangh
e105360132 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 15:42:58 +01:00
Fangh
28e03f2395 add audiomanager 2024-01-28 15:42:54 +01:00
f06223245c Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 15:42:33 +01:00
59d7c14af0 fix: dictionnary int 2024-01-28 15:42:32 +01:00
Fangh
8b35285abc update DLLs 2024-01-28 15:25:15 +01:00
Fangh
d84d18ba63 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-28 15:14:46 +01:00
Fangh
c9501ce1b0 merge 2024-01-28 15:14:42 +01:00
33e8ba68a3 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 15:10:43 +01:00
b7eb576962 design score player 2024-01-28 15:10:36 +01:00
Fangh
c8bf4e8182 credits & funny texts & playerprefs 2024-01-28 15:09:28 +01:00
2b604fdb80 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-28 14:43:23 +01:00
4735c12e74 feat: chrono takepicture + design computerview 2024-01-28 14:43:15 +01:00
8b986edc56 Merge branch 'main' of github.com:LeGall29/GGJ2024 2024-01-28 13:25:19 +01:00
98b783ab76 fix: upload image 2024-01-28 13:25:17 +01:00
Morgan - 6 Freedom
572e9e1e15 hand merging 2024-01-28 13:23:50 +01:00
Morgan - 6 Freedom
c33825d600 users can vote 2024-01-28 13:18:40 +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
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
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