Skip to content

Commit 789f27d

Browse files
frareesfrarees
authored
feat: update to v1.7.0 (#8)
1 parent 8ae2391 commit 789f27d

333 files changed

Lines changed: 533 additions & 35190 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/Scripts/FirstSteps/Player/Grabbable.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using Coherence.Connection;
32
using Coherence.Toolkit;
43
using UnityEngine;
54

@@ -35,15 +34,15 @@ private void Awake()
3534

3635
private void OnEnable()
3736
{
38-
_sync.OnAuthorityRequested += OnAuthorityRequested;
37+
_sync.OnAuthorityRequest.AddListener(OnAuthorityRequested);
3938
_sync.OnStateAuthority.AddListener(OnStateAuthority);
4039
_sync.OnStateRemote.AddListener(OnStateRemote);
4140
_sync.OnAuthorityRequestRejected.AddListener(OnRequestRejected);
4241
}
4342

4443
private void OnDisable()
4544
{
46-
_sync.OnAuthorityRequested -= OnAuthorityRequested;
45+
_sync.OnAuthorityRequest.RemoveListener(OnAuthorityRequested);
4746
_sync.OnStateAuthority.RemoveListener(OnStateAuthority);
4847
_sync.OnStateRemote.RemoveListener(OnStateRemote);
4948
_sync.OnAuthorityRequestRejected.RemoveListener(OnRequestRejected);
@@ -53,11 +52,12 @@ private void OnDisable()
5352
/// This method is called when another client requests authority. It will reject it if the grabbable
5453
/// has just been picked up by the local player. This avoids many race conditions,
5554
/// where another player would request authority in the same frame that the local player is picking
56-
/// the grabbable up, leading to a the object being in a broken state.
55+
/// the grabbable up, leading to the object being in a broken state.
5756
/// </summary>
58-
private bool OnAuthorityRequested(ClientID requesterid, AuthorityType authoritytype, CoherenceSync sync)
57+
private void OnAuthorityRequested(AuthorityRequest request, CoherenceSync sync)
5958
{
60-
return !isBeingCarried;
59+
var accept = !isBeingCarried;
60+
request.Respond(accept);
6161
}
6262

6363
/// <summary>
@@ -95,7 +95,7 @@ private void OnStateAuthority()
9595
_lastAuthorityChangeTime = Time.time;
9696
if(_pickupRequested)
9797
{
98-
// Authority change happened as a result of a pick up action
98+
// Authority change happened as a result of a pickup action
9999
_pickupRequested = false;
100100
_rigidbody.isKinematic = true;
101101
ConfirmPickup();

‎Assets/coherence/Gathered.schema‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,160 +1,160 @@
1-
component _20d53524fceab40d5a9ab892525615cb_5847726189716557621 [id "153"]
1+
component _20d53524fceab40d5a9ab892525615cb_5847726189716557621 [id "18"]
22
count Int [bits "32", range-min "-2147483648", range-max "2147483647"]
33

4-
component _27f1ac5097d4ee4409fbb87ad14f76c2_4939570989761225410 [id "154"]
4+
component _27f1ac5097d4ee4409fbb87ad14f76c2_4939570989761225410 [id "19"]
55
path String [bits "6"]
66
pathDirtyCounter Int [bits "11", range-min "-1", range-max "2000"]
77

8-
component _27f1ac5097d4ee4409fbb87ad14f76c2_6525610836190113121 [id "155"]
8+
component _27f1ac5097d4ee4409fbb87ad14f76c2_6525610836190113121 [id "20"]
99
isBeingCarried Bool [bits "1"]
1010

11-
component _6ba8b7030c4bf544396f864fc9dd99de_107609493621447933 [id "156"]
11+
component _6ba8b7030c4bf544396f864fc9dd99de_107609493621447933 [id "21"]
1212
timer Float [range-min "-9223372036854775808", range-max "9223372036854775807", compression "None"]
1313

14-
component _a0e6252c4d09f4fb28257804194356b6_5156161361901559470 [id "157"]
14+
component _a0e6252c4d09f4fb28257804194356b6_5156161361901559470 [id "22"]
1515
path String [bits "6"]
1616
pathDirtyCounter Int [bits "11", range-min "-1", range-max "2000"]
1717

18-
component _a167402e36850884aa7ce3d374cd6c77_6689584802229134021 [id "158"]
18+
component _a167402e36850884aa7ce3d374cd6c77_6689584802229134021 [id "23"]
1919
timePlanted UInt [bits "32", range-min "0", range-max "4294967295"]
2020

21-
component _aa7ea8e0044f0964eb9c782a689ca1b1_3110171900669979710 [id "159"]
21+
component _aa7ea8e0044f0964eb9c782a689ca1b1_3110171900669979710 [id "24"]
2222
rotation Quaternion [bits "12", sim-frames "true"]
2323

24-
component _aa7ea8e0044f0964eb9c782a689ca1b1_4231088705669423063 [id "160"]
24+
component _aa7ea8e0044f0964eb9c782a689ca1b1_4231088705669423063 [id "25"]
2525
rotation Quaternion [bits "12", sim-frames "true"]
2626

27-
component _aa7ea8e0044f0964eb9c782a689ca1b1_511851952794508008 [id "161"]
27+
component _aa7ea8e0044f0964eb9c782a689ca1b1_511851952794508008 [id "26"]
2828
position Vector3 [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
2929

30-
component _aa7ea8e0044f0964eb9c782a689ca1b1_6045207018197627436 [id "162"]
30+
component _aa7ea8e0044f0964eb9c782a689ca1b1_6045207018197627436 [id "27"]
3131
position Vector3 [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
3232

33-
component _aa7ea8e0044f0964eb9c782a689ca1b1_7591837871254792591 [id "163"]
33+
component _aa7ea8e0044f0964eb9c782a689ca1b1_7591837871254792591 [id "28"]
3434
position Vector3 [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
3535
rotation Quaternion [bits "12", sim-frames "true"]
3636

37-
component _aa7ea8e0044f0964eb9c782a689ca1b1_9849676 [id "164"]
37+
component _aa7ea8e0044f0964eb9c782a689ca1b1_9849676 [id "29"]
3838
ClawsOpen Bool [bits "1", sim-frames "true"]
3939

40-
component _ba50eecfd968a47c38959f27b05771b6_5459872012036489579 [id "165"]
40+
component _ba50eecfd968a47c38959f27b05771b6_5459872012036489579 [id "30"]
4141
timer Float [range-min "-9223372036854775808", range-max "9223372036854775807", compression "None"]
4242

43-
component _cd9bcc1feead9419fac0c5981ce85c23_2783100773886260066 [id "166"]
43+
component _cd9bcc1feead9419fac0c5981ce85c23_2783100773886260066 [id "31"]
4444
text String [bits "6"]
4545

46-
component _cd9bcc1feead9419fac0c5981ce85c23_4582869309862079177 [id "167"]
46+
component _cd9bcc1feead9419fac0c5981ce85c23_4582869309862079177 [id "32"]
4747
rotation Quaternion [bits "12", sim-frames "true"]
4848

49-
component _cd9bcc1feead9419fac0c5981ce85c23_5911091967807195199 [id "168"]
49+
component _cd9bcc1feead9419fac0c5981ce85c23_5911091967807195199 [id "33"]
5050
currentSkinTone Int [bits "32", range-min "-2147483648", range-max "2147483647"]
5151
currentHat Int [bits "32", range-min "-2147483648", range-max "2147483647"]
5252
currentHairStyle Int [bits "32", range-min "-2147483648", range-max "2147483647"]
5353
currentFacialHair Int [bits "32", range-min "-2147483648", range-max "2147483647"]
5454
currentBackpack Int [bits "32", range-min "-2147483648", range-max "2147483647"]
5555

56-
component _cd9bcc1feead9419fac0c5981ce85c23_7791709351172572033 [id "169"]
56+
component _cd9bcc1feead9419fac0c5981ce85c23_7791709351172572033 [id "34"]
5757
position Vector3 [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
5858

59-
component _cd9bcc1feead9419fac0c5981ce85c23_8498588009909292941 [id "170"]
59+
component _cd9bcc1feead9419fac0c5981ce85c23_8498588009909292941 [id "35"]
6060
MoveSpeed Float [bits "14", range-min "0", range-max "10", compression "FixedPoint", precision "0.001", sim-frames "true"]
6161
Grounded Bool [bits "1", sim-frames "true"]
6262
CarryingBig Bool [bits "1", sim-frames "true"]
6363
CarryingSmall Bool [bits "1", sim-frames "true"]
6464

65-
command _20d53524fceab40d5a9ab892525615cb_51bbdff1d75844e38e05ad8d40305814 [id "7", routing "All"]
65+
command _20d53524fceab40d5a9ab892525615cb_51bbdff1d75844e38e05ad8d40305814 [id "6", routing "All"]
6666

67-
command _20d53524fceab40d5a9ab892525615cb_cec10b75335d48519f4b958f85ca6685 [id "8", routing "All"]
67+
command _20d53524fceab40d5a9ab892525615cb_cec10b75335d48519f4b958f85ca6685 [id "7", routing "All"]
6868

69-
command _aa7ea8e0044f0964eb9c782a689ca1b1_d935ef02354c46c2bdb5dc4086cefeb7 [id "9", routing "All"]
69+
command _aa7ea8e0044f0964eb9c782a689ca1b1_d935ef02354c46c2bdb5dc4086cefeb7 [id "8", routing "All"]
7070
name String
7171

72-
command _cd9bcc1feead9419fac0c5981ce85c23_d210a4b9ddf7480f974318bf1cd06aa8 [id "10", routing "All"]
72+
command _cd9bcc1feead9419fac0c5981ce85c23_d210a4b9ddf7480f974318bf1cd06aa8 [id "9", routing "All"]
7373
name String
7474

7575
archetype _20d53524fceab40d5a9ab892525615cb [id "0"]
7676
lod 0
77-
WorldPosition [id "171", base-id "0"]
77+
WorldPosition [id "36", base-id "0"]
7878
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
79-
_20d53524fceab40d5a9ab892525615cb_5847726189716557621 [id "172", base-id "153"]
79+
_20d53524fceab40d5a9ab892525615cb_5847726189716557621 [id "37", base-id "18"]
8080
archetype_field count [bits "32", range-min "-2147483648", range-max "2147483647"]
8181

8282
archetype _27f1ac5097d4ee4409fbb87ad14f76c2 [id "1"]
8383
lod 0
84-
WorldPosition [id "173", base-id "0"]
84+
WorldPosition [id "38", base-id "0"]
8585
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
86-
WorldOrientation [id "174", base-id "1"]
86+
WorldOrientation [id "39", base-id "1"]
8787
archetype_field value [bits "12", sim-frames "true"]
88-
GenericScale [id "175", base-id "17"]
88+
GenericScale [id "40", base-id "17"]
8989
archetype_field value [sim-frames "true", compression "None"]
90-
_27f1ac5097d4ee4409fbb87ad14f76c2_6525610836190113121 [id "176", base-id "155"]
90+
_27f1ac5097d4ee4409fbb87ad14f76c2_6525610836190113121 [id "41", base-id "20"]
9191
archetype_field isBeingCarried [bits "1"]
92-
_27f1ac5097d4ee4409fbb87ad14f76c2_4939570989761225410 [id "177", base-id "154"]
92+
_27f1ac5097d4ee4409fbb87ad14f76c2_4939570989761225410 [id "42", base-id "19"]
9393
archetype_field path [bits "6"]
9494
archetype_field pathDirtyCounter [bits "11", range-min "-1", range-max "2000"]
9595

9696
archetype _6ba8b7030c4bf544396f864fc9dd99de [id "2"]
9797
lod 0
98-
WorldPosition [id "178", base-id "0"]
98+
WorldPosition [id "43", base-id "0"]
9999
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
100-
WorldOrientation [id "179", base-id "1"]
100+
WorldOrientation [id "44", base-id "1"]
101101
archetype_field value [bits "12", sim-frames "true"]
102-
_6ba8b7030c4bf544396f864fc9dd99de_107609493621447933 [id "180", base-id "156"]
102+
_6ba8b7030c4bf544396f864fc9dd99de_107609493621447933 [id "45", base-id "21"]
103103
archetype_field timer [range-min "-9223372036854775808", range-max "9223372036854775807", compression "None"]
104104

105105
archetype _a0e6252c4d09f4fb28257804194356b6 [id "3"]
106106
lod 0
107-
WorldPosition [id "181", base-id "0"]
107+
WorldPosition [id "46", base-id "0"]
108108
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
109-
WorldOrientation [id "182", base-id "1"]
109+
WorldOrientation [id "47", base-id "1"]
110110
archetype_field value [bits "12", sim-frames "true"]
111-
GenericScale [id "183", base-id "17"]
111+
GenericScale [id "48", base-id "17"]
112112
archetype_field value [sim-frames "true", compression "None"]
113-
_a0e6252c4d09f4fb28257804194356b6_5156161361901559470 [id "184", base-id "157"]
113+
_a0e6252c4d09f4fb28257804194356b6_5156161361901559470 [id "49", base-id "22"]
114114
archetype_field path [bits "6"]
115115
archetype_field pathDirtyCounter [bits "11", range-min "-1", range-max "2000"]
116116

117117
archetype _a167402e36850884aa7ce3d374cd6c77 [id "4"]
118118
lod 0
119-
WorldPosition [id "185", base-id "0"]
119+
WorldPosition [id "50", base-id "0"]
120120
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
121-
WorldOrientation [id "186", base-id "1"]
121+
WorldOrientation [id "51", base-id "1"]
122122
archetype_field value [bits "12", sim-frames "true"]
123-
GenericScale [id "187", base-id "17"]
123+
GenericScale [id "52", base-id "17"]
124124
archetype_field value [sim-frames "true", compression "None"]
125-
_a167402e36850884aa7ce3d374cd6c77_6689584802229134021 [id "188", base-id "158"]
125+
_a167402e36850884aa7ce3d374cd6c77_6689584802229134021 [id "53", base-id "23"]
126126
archetype_field timePlanted [bits "32", range-min "0", range-max "4294967295"]
127127

128128
archetype _ba50eecfd968a47c38959f27b05771b6 [id "5"]
129129
lod 0
130-
WorldPosition [id "189", base-id "0"]
130+
WorldPosition [id "54", base-id "0"]
131131
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
132-
_ba50eecfd968a47c38959f27b05771b6_5459872012036489579 [id "190", base-id "165"]
132+
_ba50eecfd968a47c38959f27b05771b6_5459872012036489579 [id "55", base-id "30"]
133133
archetype_field timer [range-min "-9223372036854775808", range-max "9223372036854775807", compression "None"]
134134

135135
archetype _cd9bcc1feead9419fac0c5981ce85c23 [id "6"]
136136
lod 0
137-
WorldPosition [id "191", base-id "0"]
137+
WorldPosition [id "56", base-id "0"]
138138
archetype_field value [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
139-
WorldOrientation [id "192", base-id "1"]
139+
WorldOrientation [id "57", base-id "1"]
140140
archetype_field value [bits "12", sim-frames "true"]
141-
GenericScale [id "193", base-id "17"]
141+
GenericScale [id "58", base-id "17"]
142142
archetype_field value [sim-frames "true", compression "None"]
143-
_cd9bcc1feead9419fac0c5981ce85c23_4582869309862079177 [id "194", base-id "167"]
143+
_cd9bcc1feead9419fac0c5981ce85c23_4582869309862079177 [id "59", base-id "32"]
144144
archetype_field rotation [bits "12", sim-frames "true"]
145-
_cd9bcc1feead9419fac0c5981ce85c23_5911091967807195199 [id "195", base-id "168"]
145+
_cd9bcc1feead9419fac0c5981ce85c23_5911091967807195199 [id "60", base-id "33"]
146146
archetype_field currentSkinTone [bits "32", range-min "-2147483648", range-max "2147483647"]
147147
archetype_field currentHat [bits "32", range-min "-2147483648", range-max "2147483647"]
148148
archetype_field currentHairStyle [bits "32", range-min "-2147483648", range-max "2147483647"]
149149
archetype_field currentFacialHair [bits "32", range-min "-2147483648", range-max "2147483647"]
150150
archetype_field currentBackpack [bits "32", range-min "-2147483648", range-max "2147483647"]
151-
_cd9bcc1feead9419fac0c5981ce85c23_2783100773886260066 [id "196", base-id "166"]
151+
_cd9bcc1feead9419fac0c5981ce85c23_2783100773886260066 [id "61", base-id "31"]
152152
archetype_field text [bits "6"]
153-
_cd9bcc1feead9419fac0c5981ce85c23_8498588009909292941 [id "197", base-id "170"]
153+
_cd9bcc1feead9419fac0c5981ce85c23_8498588009909292941 [id "62", base-id "35"]
154154
archetype_field MoveSpeed [bits "14", range-min "0", range-max "10", compression "FixedPoint", precision "0.001", sim-frames "true"]
155155
archetype_field Grounded [bits "1", sim-frames "true"]
156156
archetype_field CarryingBig [bits "1", sim-frames "true"]
157157
archetype_field CarryingSmall [bits "1", sim-frames "true"]
158-
_cd9bcc1feead9419fac0c5981ce85c23_7791709351172572033 [id "198", base-id "169"]
158+
_cd9bcc1feead9419fac0c5981ce85c23_7791709351172572033 [id "63", base-id "34"]
159159
archetype_field position [bits "17", range-min "-100", range-max "600", compression "FixedPoint", precision "0.01", sim-frames "true"]
160160

‎Assets/coherence/RuntimeSettings.asset‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 85b91f942a5214496b0e11eaedb54c36, type: 3}
1313
m_Name: RuntimeSettings
1414
m_EditorClassIdentifier:
15-
schemaID: 35140b9d1c4d719222209b6d55f297822d05e71a
15+
schemaID: e1db5f09aec2a463f8179e7076b68999158a07f2
1616
versionInfo: {fileID: 11400000, guid: 2191b6f902c97477baa32a7919010503, type: 2}
1717
runtimeKey: f2618e8d1484459db317d1c207413c5b
1818
simulatorSlug:
@@ -31,6 +31,7 @@ MonoBehaviour:
3131
organizationID: c1ho23prn6r43hh5tc40
3232
projectID: cetumgdbo1hk1jjq3j00
3333
projectName: First Steps tutorial
34+
organizationName:
3435
transportType: 0
3536
transportConfiguration: 0
3637
advancedSettings:
@@ -47,3 +48,4 @@ MonoBehaviour:
4748
extraSchemas: []
4849
defaultTransportMode: 0
4950
defaultTransportModeMigrated: 1
51+
defaultAuthorityTransferType: 2

0 commit comments

Comments
 (0)