Commit Graph

303 Commits

Author SHA1 Message Date
bbb2a98412 Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-29 22:26:57 +01:00
5050a303b3 submit button phone view 2024-01-29 22:26:49 +01:00
Fangh
91d0710ce9 Merge branch 'main' of https://git.crystalyx.net/GameJams/Snaparazzi 2024-01-29 22:19:34 +01:00
Fangh
ad481d6ee3 fix: continueWith => continueWithOnMainThread 2024-01-29 22:19:22 +01:00
f585b53f4f Merge branch 'main' of ssh://patema.crystalyx.net:2222/GameJams/Snaparazzi 2024-01-29 22:17:25 +01:00
675c41431a add scriptable object for funny text 2024-01-29 22:17:14 +01:00
Fangh
099c3c3a86 fix(takepicture): set reference of submit button 2024-01-29 22:13:31 +01:00
Fangh
d560dfcee5 fix: (i hope) when player vote, it does not display next vote 2024-01-29 22:10:52 +01:00
Fangh
75723a3b06 fix: no link for vanille 2024-01-29 21:40:36 +01:00
Fangh
82d7834093 update: voting page on pc 2024-01-29 21:36:17 +01:00
Fangh
6840171608 fix: (hopefully) i create a new voter list if it's empty instead of null ref 2024-01-29 21:34:39 +01:00
Fangh
f379a3d5c8 Update PhoneView.unity 2024-01-29 21:30:29 +01:00
Fangh
edd04888ed fix: players can (hopefully) vote 2024-01-29 21:30:09 +01:00
Fangh
099d717427 fix: update colors on home page 2024-01-29 21:15:16 +01:00
Fangh
08162191c8 feat: mute music button 2024-01-29 21:11:49 +01:00
Fangh
fa45a83124 wip: try to fix local i issue 2024-01-29 21:01:09 +01:00
Fangh
274d4cc3dc fix: page vote wasn't displayed if you were on waiting for other players 2024-01-29 20:54:35 +01:00
Fangh
489102c948 fix: when 2 photos has been taken, should go to waiting page 2024-01-29 20:50:32 +01:00
Fangh
c46d35df1b fix: Take Picture State 2024-01-29 20:39:15 +01:00
Fangh
8ed7abbba2 if all players push there 2 propositions, it goes to next page auto 2024-01-29 20:18:09 +01:00
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