merging v2.5.0

.github/CODEOWNERS

@@ -13,4 +13,4 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Global rule:
-*           @SamuelBellomo
+*           @Unity-Technologies/mtt-samples-eng

.yamato/mobile-build-and-run.yml

@@ -9,7 +9,7 @@ Build_Player_With_Tests_iOS_{{ project.name }}_{{ editor }}:
     name: build {{ project.name }} - {{ editor }} on iOS
     agent:
         type: Unity::VM::osx
-        image: mobile/macos-10.15-testing:stable
+        image: package-ci/macos-12:v4
         flavor: b1.large
 
     commands:
@@ -70,7 +70,7 @@ mobile_test_ios_{{ project.name }}_{{ editor }}:
     name: {{ project.name }} mobile project tests - {{ editor }} on iOS
     agent:
         type: Unity::mobile::iPhone
-        image: mobile/macos-10.15-testing:latest
+        image: package-ci/macos-12:v4
         flavor: b1.medium
 
     # Skip repository cloning

.yamato/project-standards.yml

@@ -5,7 +5,7 @@ standards_{{ projects.first.name }}:
   agent:
     type: Unity::VM
     image: desktop/logging-testing-linux:v0.1.2-926285
-    flavor: b1.medium
+    flavor: b1.large
   commands:
     - dotnet --version
     - dotnet format --version

.yamato/project.metafile

@@ -2,19 +2,19 @@
 test_platforms:
   - name: win
     type: Unity::VM
-    image: package-ci/win10:stable
+    image: package-ci/win10:v4
     flavor: b1.large
     editorpath: .Editor\Unity.exe
     utr: .\utr.bat
   - name: mac
     type: Unity::VM::osx
-    image: package-ci/mac:stable
+    image: package-ci/macos-12:v4
     flavor: b1.large
     editorpath: .Editor/Unity.app/Contents/MacOS/Unity
     utr: ./utr
   - name: ubuntu
     type: Unity::VM
-    image: package-ci/ubuntu:stable
+    image: package-ci/ubuntu-18.04:v4
     flavor: b1.large
     editorpath: .Editor/Unity
     utr: ./utr
@@ -30,4 +30,4 @@ projects:
       - name: com.unity.multiplayer.samples.coop
         path: Packages/com.unity.multiplayer.samples.coop
     test_editors:
-      - 2022.2
+      - 2022.3

Assets/Prefabs/AdditiveSceneLoader.prefab

@@ -10,8 +10,8 @@ GameObject:
   m_Component:
   - component: {fileID: 3765979716845461200}
   - component: {fileID: 3765979716845461207}
-  - component: {fileID: 3765979716845461206}
   - component: {fileID: 3029178677072641126}
+  - component: {fileID: 3765979716845461206}
   m_Layer: 2
   m_Name: AdditiveSceneLoader
   m_TagString: Untagged
@@ -26,12 +26,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3765979716845461205}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!65 &3765979716845461207
 BoxCollider:
@@ -41,12 +42,20 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3765979716845461205}
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
   m_IsTrigger: 1
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 2
+  serializedVersion: 3
   m_Size: {x: 0, y: 0, z: 0}
   m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &3765979716845461206
+--- !u!114 &3029178677072641126
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -55,13 +64,17 @@ MonoBehaviour:
   m_GameObject: {fileID: 3765979716845461205}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
+  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_DelayBeforeUnload: 5
-  m_SceneName: 
-  m_PlayerTag: Player
---- !u!114 &3029178677072641126
+  GlobalObjectIdHash: 951099334
+  AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
+  DontDestroyWithOwner: 0
+  AutoObjectParentSync: 1
+--- !u!114 &3765979716845461206
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -70,10 +83,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 3765979716845461205}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
+  m_Script: {fileID: 11500000, guid: f4506649f88aac74ea839a52818e3174, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  GlobalObjectIdHash: 951099334
-  AlwaysReplicateAsRoot: 0
-  DontDestroyWithOwner: 0
-  AutoObjectParentSync: 1
+  m_DelayBeforeUnload: 5
+  m_SceneName: 
+  m_PlayerTag: Player

Assets/Prefabs/Character/Character.prefab

@@ -58,6 +58,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 951099334
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 1
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &514105321093282895
@@ -100,7 +103,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 920a440eb254ba348915767fd046027a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_ClientVisualization: {fileID: 0}
+  m_ClientCharacter: {fileID: 0}
   m_CharacterClass: {fileID: 0}
   m_BrainEnabled: 1
   m_KilledDestroyDelaySeconds: 3
@@ -231,7 +234,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   SyncPositionX: 1
-  SyncPositionY: 1
+  SyncPositionY: 0
   SyncPositionZ: 1
   SyncRotAngleX: 0
   SyncRotAngleY: 1
@@ -242,8 +245,12 @@ MonoBehaviour:
   PositionThreshold: 0.001
   RotAngleThreshold: 0.01
   ScaleThreshold: 0.01
+  UseQuaternionSynchronization: 0
+  UseQuaternionCompression: 0
+  UseHalfFloatPrecision: 1
   InLocalSpace: 0
   Interpolate: 1
+  SlerpPosition: 0
 --- !u!114 &3884788294438199994
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Prefabs/Character/PersistentPlayer.prefab

@@ -30,6 +30,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -48,6 +49,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GlobalObjectIdHash: 951099334
   AlwaysReplicateAsRoot: 0
+  SynchronizeTransform: 0
+  ActiveSceneSynchronization: 0
+  SceneMigrationSynchronization: 1
   DontDestroyWithOwner: 0
   AutoObjectParentSync: 1
 --- !u!114 &-5536186819612961332