1.0-pre-15 release

2022-12-08 14:22:37 -05:00 · 2022-12-08 14:22:37 -05:00 · 2bf2a4d905
--- a/Basic/Assets/Data/Input/BasicInputActions.cs
+++ b/Basic/Assets/Data/Input/BasicInputActions.cs
@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was auto-generated by com.unity.inputsystem:InputActionCodeGenerator
-//     version 1.4.3
+//     version 1.4.4
 //     from Assets/Data/Input/BasicInputActions.inputactions
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
--- a/Basic/Assets/Rival/README.pdf
+++ b/Basic/Assets/Rival/README.pdf
--- a/OnlineFPS/Assets/GlobalEntitiesDependencies.meta
+++ b/OnlineFPS/Assets/GlobalEntitiesDependencies.meta
@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: d979cd8f21b415c44b11a45918fc76c2
-folderAsset: yes
+guid: d034e085bb1a5734c80a0fc6e37b91c4
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Basic/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
+++ b/Basic/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
--- a/Basic/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
+++ b/Basic/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
--- a/Basic/Assets/Rival/license.txt
+++ b/Basic/Assets/Rival/license.txt
@ -0,0 +1,5 @@
+Rival - DOTS Character Controller for Unity Copyright (c) 2022 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License (https://unity.com/legal/licenses/unity-companion-license)
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/OnlineFPS/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset.meta
+++ b/OnlineFPS/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset.meta
@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 950efebb119d40749a4a21bc4c5101ff
-NativeFormatImporter:
+guid: 79d2ca261c7342641b6fefe16951d7b5
+TextScriptImporter:
  externalObjects: {}
-  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Basic/Assets/SceneDependencyCache.meta
+++ b/Basic/Assets/SceneDependencyCache.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a416e4226a6ae9842a9938ee2df2e824
+guid: e157296f77a4d34488f1881ea5841589
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Basic/Assets/SceneDependencyCache/04a4cb190917139c026c7e5c8c8413c4.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/04a4cb190917139c026c7e5c8c8413c4.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/04a4cb190917139c026c7e5c8c8413c4.sceneWithBuildSettings.meta
+++ b/Basic/Assets/SceneDependencyCache/04a4cb190917139c026c7e5c8c8413c4.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 04a4cb190917139c026c7e5c8c8413c4
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Basic/Assets/SceneDependencyCache/39bfa491d431c9d0180e758a345b5101.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/39bfa491d431c9d0180e758a345b5101.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/39bfa491d431c9d0180e758a345b5101.sceneWithBuildSettings.meta
+++ b/Basic/Assets/SceneDependencyCache/39bfa491d431c9d0180e758a345b5101.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 39bfa491d431c9d0180e758a345b5101
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Basic/Assets/SceneDependencyCache/4201ee7e2717478bdd31da12fce6929c.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/4201ee7e2717478bdd31da12fce6929c.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/4201ee7e2717478bdd31da12fce6929c.sceneWithBuildSettings.meta
+++ b/Basic/Assets/SceneDependencyCache/4201ee7e2717478bdd31da12fce6929c.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4201ee7e2717478bdd31da12fce6929c
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Basic/Assets/SceneDependencyCache/99c9726bf141b0d3f783edef981a776c.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/99c9726bf141b0d3f783edef981a776c.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/ba49d8ba11a4f1ff4ee7c9da57488da8.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/ba49d8ba11a4f1ff4ee7c9da57488da8.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/ba49d8ba11a4f1ff4ee7c9da57488da8.sceneWithBuildSettings.meta
+++ b/Basic/Assets/SceneDependencyCache/ba49d8ba11a4f1ff4ee7c9da57488da8.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ba49d8ba11a4f1ff4ee7c9da57488da8
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Basic/Assets/SceneDependencyCache/f590d804a19ceac7254394c76e1cfb93.sceneWithBuildSettings
+++ b/Basic/Assets/SceneDependencyCache/f590d804a19ceac7254394c76e1cfb93.sceneWithBuildSettings
--- a/Basic/Assets/SceneDependencyCache/f590d804a19ceac7254394c76e1cfb93.sceneWithBuildSettings.meta
+++ b/Basic/Assets/SceneDependencyCache/f590d804a19ceac7254394c76e1cfb93.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f590d804a19ceac7254394c76e1cfb93
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/Basic/Packages/manifest.json
+++ b/Basic/Packages/manifest.json
@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "com.unity.collab-proxy": "1.17.6",
+    "com.unity.collab-proxy": "1.17.7",
    "com.unity.entities": "1.0.0-pre.15",
    "com.unity.entities.graphics": "1.0.0-pre.15",
    "com.unity.ide.rider": "3.0.16",
@ -9,7 +9,7 @@
    "com.unity.inputsystem": "1.4.4",
    "com.unity.performance.profile-analyzer": "1.1.1",
    "com.unity.physics": "1.0.0-pre.15",
-    "com.unity.render-pipelines.universal": "14.0.3",
+    "com.unity.render-pipelines.universal": "14.0.4",
    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.7.2",
--- a/Basic/Packages/packages-lock.json
+++ b/Basic/Packages/packages-lock.json
@ -10,7 +10,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "1.17.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -152,7 +152,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@ -163,14 +163,14 @@
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.mathematics": "1.2.1",
        "com.unity.burst": "1.7.3",
-        "com.unity.render-pipelines.core": "14.0.3",
-        "com.unity.shadergraph": "14.0.3"
+        "com.unity.render-pipelines.core": "14.0.4",
+        "com.unity.shadergraph": "14.0.4"
      }
    },
    "com.unity.scriptablebuildpipeline": {
@ -210,11 +210,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.3",
+        "com.unity.render-pipelines.core": "14.0.4",
        "com.unity.searcher": "4.9.2"
      }
    },
--- a/Basic/ProjectSettings/ProjectVersion.txt
+++ b/Basic/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.0b16
-m_EditorVersionWithRevision: 2022.2.0b16 (3c3b3e6cd1d7)
+m_EditorVersion: 2022.2.0f1
+m_EditorVersionWithRevision: 2022.2.0f1 (35dcd44975df)
--- a/LICENSE.md
+++ b/LICENSE.md
@ -2,4 +2,4 @@ Rival Samples Copyright (c) 2022 Unity Technologies ApS

 Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License). 

-Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/OnlineFPS/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset
+++ b/OnlineFPS/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset
@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83423c6821253f946aa2dd9db23584ed, type: 3}
-  m_Name: GlobalEntitySceneDependency
-  m_EditorClassIdentifier: 
-  cacheGUID:
-    Value:
-      x: 3540417569
-      y: 1234066734
-      z: 2770197947
-      w: 4177519355
--- a/OnlineFPS/Assets/Rival/README.pdf
+++ b/OnlineFPS/Assets/Rival/README.pdf
--- a/StressTest/Assets/GlobalEntitiesDependencies.meta
+++ b/StressTest/Assets/GlobalEntitiesDependencies.meta
@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: b1b16b6fe6c229c4ebce385de2b61301
-folderAsset: yes
+guid: d034e085bb1a5734c80a0fc6e37b91c4
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/OnlineFPS/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
+++ b/OnlineFPS/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
--- a/OnlineFPS/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
+++ b/OnlineFPS/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
--- a/OnlineFPS/Assets/Rival/license.txt
+++ b/OnlineFPS/Assets/Rival/license.txt
@ -0,0 +1,5 @@
+Rival - DOTS Character Controller for Unity Copyright (c) 2022 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License (https://unity.com/legal/licenses/unity-companion-license)
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/StressTest/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset.meta
+++ b/StressTest/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset.meta
@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 62eca32dae9383643bf414a31a933ef1
-NativeFormatImporter:
+guid: 79d2ca261c7342641b6fefe16951d7b5
+TextScriptImporter:
  externalObjects: {}
-  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/OnlineFPS/Assets/SceneDependencyCache.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a7f04041aaa673841ac6428b7cd116d4
+guid: e5b0a806180939242b66b5b4de3f570e
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/OnlineFPS/Assets/SceneDependencyCache/05ec67148585be3d63bc620246b9faee.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/05ec67148585be3d63bc620246b9faee.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/05ec67148585be3d63bc620246b9faee.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/05ec67148585be3d63bc620246b9faee.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 05ec67148585be3d63bc620246b9faee
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/0c9187ee44289fc90c242e6b8ba52b15.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/0c9187ee44289fc90c242e6b8ba52b15.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/0c9187ee44289fc90c242e6b8ba52b15.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/0c9187ee44289fc90c242e6b8ba52b15.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0c9187ee44289fc90c242e6b8ba52b15
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/0e65b6ebea98e313731e6dabfa28e88f.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/0e65b6ebea98e313731e6dabfa28e88f.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/0e65b6ebea98e313731e6dabfa28e88f.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/0e65b6ebea98e313731e6dabfa28e88f.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 0e65b6ebea98e313731e6dabfa28e88f
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/2b0bd694ef0b9bcb493163bbca8836d5.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/2b0bd694ef0b9bcb493163bbca8836d5.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/2b0bd694ef0b9bcb493163bbca8836d5.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/2b0bd694ef0b9bcb493163bbca8836d5.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2b0bd694ef0b9bcb493163bbca8836d5
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/5af2942fc66e2601f88ff9fbfa006255.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/5af2942fc66e2601f88ff9fbfa006255.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/5af2942fc66e2601f88ff9fbfa006255.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/5af2942fc66e2601f88ff9fbfa006255.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5af2942fc66e2601f88ff9fbfa006255
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/68a9e819fe43666f5106cfe7d65ab522.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/68a9e819fe43666f5106cfe7d65ab522.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/68a9e819fe43666f5106cfe7d65ab522.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/68a9e819fe43666f5106cfe7d65ab522.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 68a9e819fe43666f5106cfe7d65ab522
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/7103a9044425fcfda4121bf862159a09.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/7103a9044425fcfda4121bf862159a09.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/7103a9044425fcfda4121bf862159a09.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/7103a9044425fcfda4121bf862159a09.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7103a9044425fcfda4121bf862159a09
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/b863e86eb693a738ed439946cab780f8.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/b863e86eb693a738ed439946cab780f8.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/b863e86eb693a738ed439946cab780f8.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/b863e86eb693a738ed439946cab780f8.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b863e86eb693a738ed439946cab780f8
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/cfce89a42faf90a97cafa4e2cd6ebd96.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/cfce89a42faf90a97cafa4e2cd6ebd96.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/cfce89a42faf90a97cafa4e2cd6ebd96.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/cfce89a42faf90a97cafa4e2cd6ebd96.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: cfce89a42faf90a97cafa4e2cd6ebd96
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/defa4dd2291529cd3514a647a2d7d710.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/defa4dd2291529cd3514a647a2d7d710.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/defa4dd2291529cd3514a647a2d7d710.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/defa4dd2291529cd3514a647a2d7d710.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: defa4dd2291529cd3514a647a2d7d710
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/e41943eebc283f7a9e0a464179beadab.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/e41943eebc283f7a9e0a464179beadab.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/e41943eebc283f7a9e0a464179beadab.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/e41943eebc283f7a9e0a464179beadab.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e41943eebc283f7a9e0a464179beadab
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Assets/SceneDependencyCache/f2e8af0f32803f74a549dafc093947f2.sceneWithBuildSettings
+++ b/OnlineFPS/Assets/SceneDependencyCache/f2e8af0f32803f74a549dafc093947f2.sceneWithBuildSettings
--- a/OnlineFPS/Assets/SceneDependencyCache/f2e8af0f32803f74a549dafc093947f2.sceneWithBuildSettings.meta
+++ b/OnlineFPS/Assets/SceneDependencyCache/f2e8af0f32803f74a549dafc093947f2.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f2e8af0f32803f74a549dafc093947f2
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/OnlineFPS/Packages/manifest.json
+++ b/OnlineFPS/Packages/manifest.json
@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "com.unity.collab-proxy": "1.17.6",
+    "com.unity.collab-proxy": "1.17.7",
    "com.unity.entities": "1.0.0-pre.15",
    "com.unity.entities.graphics": "1.0.0-pre.15",
    "com.unity.ide.rider": "3.0.16",
@ -10,7 +10,7 @@
    "com.unity.netcode": "1.0.0-pre.15",
    "com.unity.performance.profile-analyzer": "1.1.1",
    "com.unity.physics": "1.0.0-pre.15",
-    "com.unity.render-pipelines.universal": "14.0.3",
+    "com.unity.render-pipelines.universal": "14.0.4",
    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.7.2",
--- a/OnlineFPS/Packages/packages-lock.json
+++ b/OnlineFPS/Packages/packages-lock.json
@ -10,7 +10,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "1.17.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -174,7 +174,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@ -185,14 +185,14 @@
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.mathematics": "1.2.1",
        "com.unity.burst": "1.7.3",
-        "com.unity.render-pipelines.core": "14.0.3",
-        "com.unity.shadergraph": "14.0.3"
+        "com.unity.render-pipelines.core": "14.0.4",
+        "com.unity.shadergraph": "14.0.4"
      }
    },
    "com.unity.scriptablebuildpipeline": {
@ -232,11 +232,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.3",
+        "com.unity.render-pipelines.core": "14.0.4",
        "com.unity.searcher": "4.9.2"
      }
    },
--- a/OnlineFPS/ProjectSettings/ProjectVersion.txt
+++ b/OnlineFPS/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.0b16
-m_EditorVersionWithRevision: 2022.2.0b16 (3c3b3e6cd1d7)
+m_EditorVersion: 2022.2.0f1
+m_EditorVersionWithRevision: 2022.2.0f1 (35dcd44975df)
--- a/Platformer/Assets/Rival/README.pdf
+++ b/Platformer/Assets/Rival/README.pdf
--- a/Platformer/Assets/Rival/README.pdf.meta
+++ b/Platformer/Assets/Rival/README.pdf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d034e085bb1a5734c80a0fc6e37b91c4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Platformer/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
+++ b/Platformer/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
--- a/Platformer/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
+++ b/Platformer/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
--- a/Platformer/Assets/Rival/license.txt
+++ b/Platformer/Assets/Rival/license.txt
@ -0,0 +1,5 @@
+Rival - DOTS Character Controller for Unity Copyright (c) 2022 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License (https://unity.com/legal/licenses/unity-companion-license)
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/Platformer/Assets/Rival/license.txt.meta
+++ b/Platformer/Assets/Rival/license.txt.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79d2ca261c7342641b6fefe16951d7b5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Platformer/Assets/SceneDependencyCache.meta
+++ b/Platformer/Assets/SceneDependencyCache.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 79eefdb62e40247409776164124dcd73
+guid: 6a17266248603ef4d8d9abae319466d5
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Platformer/Assets/SceneDependencyCache/04e3c8f90a32ae6f25e2a1db2f322df5.sceneWithBuildSettings
+++ b/Platformer/Assets/SceneDependencyCache/04e3c8f90a32ae6f25e2a1db2f322df5.sceneWithBuildSettings
--- a/Platformer/Packages/manifest.json
+++ b/Platformer/Packages/manifest.json
@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "com.unity.collab-proxy": "1.17.6",
+    "com.unity.collab-proxy": "1.17.7",
    "com.unity.entities": "1.0.0-pre.15",
    "com.unity.entities.graphics": "1.0.0-pre.15",
    "com.unity.ide.rider": "3.0.16",
@ -9,7 +9,7 @@
    "com.unity.inputsystem": "1.4.4",
    "com.unity.performance.profile-analyzer": "1.1.1",
    "com.unity.physics": "1.0.0-pre.15",
-    "com.unity.render-pipelines.universal": "14.0.3",
+    "com.unity.render-pipelines.universal": "14.0.4",
    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.7.2",
--- a/Platformer/Packages/packages-lock.json
+++ b/Platformer/Packages/packages-lock.json
@ -10,7 +10,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "1.17.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -152,7 +152,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@ -163,14 +163,14 @@
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.mathematics": "1.2.1",
        "com.unity.burst": "1.7.3",
-        "com.unity.render-pipelines.core": "14.0.3",
-        "com.unity.shadergraph": "14.0.3"
+        "com.unity.render-pipelines.core": "14.0.4",
+        "com.unity.shadergraph": "14.0.4"
      }
    },
    "com.unity.scriptablebuildpipeline": {
@ -210,11 +210,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.3",
+        "com.unity.render-pipelines.core": "14.0.4",
        "com.unity.searcher": "4.9.2"
      }
    },
--- a/Platformer/ProjectSettings/ProjectVersion.txt
+++ b/Platformer/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.0b16
-m_EditorVersionWithRevision: 2022.2.0b16 (3c3b3e6cd1d7)
+m_EditorVersion: 2022.2.0f1
+m_EditorVersionWithRevision: 2022.2.0f1 (35dcd44975df)
--- a/StressTest/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset
+++ b/StressTest/Assets/GlobalEntitiesDependencies/GlobalEntitySceneDependency.asset
@ -1,20 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83423c6821253f946aa2dd9db23584ed, type: 3}
-  m_Name: GlobalEntitySceneDependency
-  m_EditorClassIdentifier: 
-  cacheGUID:
-    Value:
-      x: 2891241774
-      y: 1191054990
-      z: 985143723
-      w: 2992049677
--- a/StressTest/Assets/Rival/README.pdf
+++ b/StressTest/Assets/Rival/README.pdf
--- a/StressTest/Assets/Rival/README.pdf.meta
+++ b/StressTest/Assets/Rival/README.pdf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d034e085bb1a5734c80a0fc6e37b91c4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/StressTest/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
+++ b/StressTest/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
--- a/StressTest/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
+++ b/StressTest/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
--- a/StressTest/Assets/Rival/license.txt
+++ b/StressTest/Assets/Rival/license.txt
@ -0,0 +1,5 @@
+Rival - DOTS Character Controller for Unity Copyright (c) 2022 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License (https://unity.com/legal/licenses/unity-companion-license)
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/StressTest/Assets/Rival/license.txt.meta
+++ b/StressTest/Assets/Rival/license.txt.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79d2ca261c7342641b6fefe16951d7b5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/StressTest/Assets/SceneDependencyCache.meta
+++ b/StressTest/Assets/SceneDependencyCache.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ccf6cf701d6b5504384678d682cb9d49
+guid: c501ecc6a7cb7ca4eb7bcd64228f1099
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/StressTest/Assets/SceneDependencyCache/17f76bd53c88f650db3a21bb140be6e1.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/17f76bd53c88f650db3a21bb140be6e1.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/1a2764b8e9669e59b5b55340dec7396a.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/1a2764b8e9669e59b5b55340dec7396a.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/1a2764b8e9669e59b5b55340dec7396a.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/1a2764b8e9669e59b5b55340dec7396a.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 1a2764b8e9669e59b5b55340dec7396a
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Assets/SceneDependencyCache/2af98a4dd882546bb21557b73c22be58.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/2af98a4dd882546bb21557b73c22be58.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/2af98a4dd882546bb21557b73c22be58.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/2af98a4dd882546bb21557b73c22be58.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 2af98a4dd882546bb21557b73c22be58
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Assets/SceneDependencyCache/95731dd9238cb3b7c919f84390bf3e64.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/95731dd9238cb3b7c919f84390bf3e64.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/95731dd9238cb3b7c919f84390bf3e64.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/95731dd9238cb3b7c919f84390bf3e64.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 95731dd9238cb3b7c919f84390bf3e64
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Assets/SceneDependencyCache/a57139dc6337a011d4e9f02cd72a5908.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/a57139dc6337a011d4e9f02cd72a5908.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/a57139dc6337a011d4e9f02cd72a5908.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/a57139dc6337a011d4e9f02cd72a5908.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a57139dc6337a011d4e9f02cd72a5908
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Assets/SceneDependencyCache/b25ba0d432884169f77f191e27fd1a19.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/b25ba0d432884169f77f191e27fd1a19.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/b25ba0d432884169f77f191e27fd1a19.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/b25ba0d432884169f77f191e27fd1a19.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b25ba0d432884169f77f191e27fd1a19
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Assets/SceneDependencyCache/ff97f6f657bbe9caa9004db02d37109a.sceneWithBuildSettings
+++ b/StressTest/Assets/SceneDependencyCache/ff97f6f657bbe9caa9004db02d37109a.sceneWithBuildSettings
--- a/StressTest/Assets/SceneDependencyCache/ff97f6f657bbe9caa9004db02d37109a.sceneWithBuildSettings.meta
+++ b/StressTest/Assets/SceneDependencyCache/ff97f6f657bbe9caa9004db02d37109a.sceneWithBuildSettings.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ff97f6f657bbe9caa9004db02d37109a
-DefaultImporter:
-  externalObjects: {}
-  userData:
-  assetBundleName:
-  assetBundleVariant:
--- a/StressTest/Packages/manifest.json
+++ b/StressTest/Packages/manifest.json
@ -1,6 +1,6 @@
 {
  "dependencies": {
-    "com.unity.collab-proxy": "1.17.6",
+    "com.unity.collab-proxy": "1.17.7",
    "com.unity.entities": "1.0.0-pre.15",
    "com.unity.entities.graphics": "1.0.0-pre.15",
    "com.unity.ide.rider": "3.0.16",
@ -9,7 +9,7 @@
    "com.unity.inputsystem": "1.4.4",
    "com.unity.performance.profile-analyzer": "1.1.1",
    "com.unity.physics": "1.0.0-pre.15",
-    "com.unity.render-pipelines.universal": "14.0.3",
+    "com.unity.render-pipelines.universal": "14.0.4",
    "com.unity.test-framework": "1.1.33",
    "com.unity.textmeshpro": "3.0.6",
    "com.unity.timeline": "1.7.2",
--- a/StressTest/Packages/packages-lock.json
+++ b/StressTest/Packages/packages-lock.json
@ -10,7 +10,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.collab-proxy": {
-      "version": "1.17.6",
+      "version": "1.17.7",
      "depth": 0,
      "source": "registry",
      "dependencies": {
@ -152,7 +152,7 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.render-pipelines.core": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
@ -163,14 +163,14 @@
      }
    },
    "com.unity.render-pipelines.universal": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 0,
      "source": "builtin",
      "dependencies": {
        "com.unity.mathematics": "1.2.1",
        "com.unity.burst": "1.7.3",
-        "com.unity.render-pipelines.core": "14.0.3",
-        "com.unity.shadergraph": "14.0.3"
+        "com.unity.render-pipelines.core": "14.0.4",
+        "com.unity.shadergraph": "14.0.4"
      }
    },
    "com.unity.scriptablebuildpipeline": {
@ -210,11 +210,11 @@
      "url": "https://packages.unity.com"
    },
    "com.unity.shadergraph": {
-      "version": "14.0.3",
+      "version": "14.0.4",
      "depth": 1,
      "source": "builtin",
      "dependencies": {
-        "com.unity.render-pipelines.core": "14.0.3",
+        "com.unity.render-pipelines.core": "14.0.4",
        "com.unity.searcher": "4.9.2"
      }
    },
--- a/StressTest/ProjectSettings/ProjectVersion.txt
+++ b/StressTest/ProjectSettings/ProjectVersion.txt
@ -1,2 +1,2 @@
-m_EditorVersion: 2022.2.0b16
-m_EditorVersionWithRevision: 2022.2.0b16 (3c3b3e6cd1d7)
+m_EditorVersion: 2022.2.0f1
+m_EditorVersionWithRevision: 2022.2.0f1 (35dcd44975df)
--- a/Tutorial/Assets/Rival/README.pdf
+++ b/Tutorial/Assets/Rival/README.pdf
--- a/Tutorial/Assets/Rival/README.pdf.meta
+++ b/Tutorial/Assets/Rival/README.pdf.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d034e085bb1a5734c80a0fc6e37b91c4
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Tutorial/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
+++ b/Tutorial/Assets/Rival/StandardCharacters/StandardCharacter_FirstPerson.unitypackage
--- a/Tutorial/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
+++ b/Tutorial/Assets/Rival/StandardCharacters/StandardCharacter_ThirdPerson.unitypackage
--- a/Tutorial/Assets/Rival/license.txt
+++ b/Tutorial/Assets/Rival/license.txt
@ -0,0 +1,5 @@
+Rival - DOTS Character Controller for Unity Copyright (c) 2022 Unity Technologies ApS
+
+Licensed under the Unity Companion License for Unity-dependent projects--see Unity Companion License (https://unity.com/legal/licenses/unity-companion-license)
+
+Unless expressly provided otherwise, the Software under this license is made available strictly on an “AS IS” BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.
--- a/Tutorial/Assets/Rival/license.txt.meta
+++ b/Tutorial/Assets/Rival/license.txt.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 79d2ca261c7342641b6fefe16951d7b5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Tutorial/Assets/SceneDependencyCache.meta
+++ b/Tutorial/Assets/SceneDependencyCache.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 16c2ddd4f29b45b40aa092027bce2146
+guid: 826efcbc37d78c54aa9b75b8a5252a8e
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Показать больше
+++ b/Показать больше