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 |
|
|
|
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 |
|
|
|
bff9a36fce
|
fix: use OnEnable/OnDisable on CameraManager
|
2024-01-27 18:09:40 +01:00 |
|
|
|
530cca0be2
|
merge conflict
|
2024-01-27 17:59:12 +01:00 |
|
|
|
78c40dd9d5
|
player connected
|
2024-01-27 17:56:03 +01:00 |
|
Morgan - 6 Freedom
|
cd659d87d5
|
player really join rooms
|
2024-01-27 17:54:37 +01:00 |
|
|
|
7fd4657e81
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 17:54:07 +01:00 |
|
|
|
249121e775
|
feat: webcam memory leak fixed
|
2024-01-27 17:54:03 +01:00 |
|
Otaku9999
|
0383ae9d1b
|
Full prompt
|
2024-01-27 17:21:03 +01:00 |
|
Otaku9999
|
c9923f789a
|
Merge branch 'main' of https://github.com/LeGall29/GGJ2024
|
2024-01-27 17:14:06 +01:00 |
|
Otaku9999
|
45cf7529fb
|
50 prompt
|
2024-01-27 17:14:00 +01:00 |
|
|
|
1de9e63770
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 16:39:12 +01:00 |
|
|
|
a07aa506b4
|
feat: webcam working
|
2024-01-27 16:39:10 +01:00 |
|
Morgan - 6 Freedom
|
9c00e5379e
|
Merge branch 'main' of https://github.com/LeGall29/GGJ2024
|
2024-01-27 16:32:58 +01:00 |
|
Morgan - 6 Freedom
|
9d8019556c
|
player can connect WIP
|
2024-01-27 16:32:12 +01:00 |
|
|
|
d0dbe7842a
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 16:26:55 +01:00 |
|
Otaku9999
|
7ceb0a1c58
|
Merge branch 'main' of https://github.com/LeGall29/GGJ2024
|
2024-01-27 16:26:14 +01:00 |
|
Otaku9999
|
bab28a7c83
|
About half
|
2024-01-27 16:26:06 +01:00 |
|
|
|
8b035e6a30
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 16:26:05 +01:00 |
|
|
|
c776bbf9a5
|
connect UI
|
2024-01-27 16:25:53 +01:00 |
|
Morgan - 6 Freedom
|
449c0829ae
|
room can create a unique code
|
2024-01-27 15:54:23 +01:00 |
|
|
|
5a39339251
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 15:22:49 +01:00 |
|
|
|
95665b2aab
|
feat: webcam crop
|
2024-01-27 15:22:45 +01:00 |
|
Morgan - 6 Freedom
|
6375f4a34f
|
we can create rooms
|
2024-01-27 15:08:12 +01:00 |
|
Morgan - 6 Freedom
|
2620d91331
|
fix authentication
|
2024-01-27 14:51:34 +01:00 |
|
Morgan - 6 Freedom
|
ea295d0325
|
Merge branch 'main' of https://github.com/LeGall29/GGJ2024
|
2024-01-27 13:47:11 +01:00 |
|
Morgan - 6 Freedom
|
01804c4724
|
GameManager WIP
|
2024-01-27 13:46:54 +01:00 |
|
|
|
31f9e1415e
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 13:44:02 +01:00 |
|
|
|
71b048749c
|
phoneView
|
2024-01-27 13:43:40 +01:00 |
|
|
|
f6b5408275
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 13:39:27 +01:00 |
|
|
|
af7bd2eb95
|
feat: webcam buttons
|
2024-01-27 13:39:18 +01:00 |
|
Morgan - 6 Freedom
|
c8b7b702d7
|
Merge branch 'main' of https://github.com/LeGall29/GGJ2024
|
2024-01-27 13:19:59 +01:00 |
|
Morgan - 6 Freedom
|
7cd731697a
|
WIP of room manager
|
2024-01-27 13:19:56 +01:00 |
|
|
|
ccd98edd53
|
Merge branch 'main' of github.com:LeGall29/GGJ2024
|
2024-01-27 12:33:35 +01:00 |
|
|
|
db1c510f01
|
feat: webcam
|
2024-01-27 12:31:58 +01:00 |
|
