From d7711f5cc7d6238b720cc235f4967b0de6b0c7dc Mon Sep 17 00:00:00 2001 From: Samuel Bellomo Date: Fri, 23 Sep 2022 15:14:58 -0400 Subject: [PATCH 1/3] editor bump and associated package auto-bumps --- Packages/manifest.json | 16 ++++++------ Packages/packages-lock.json | 40 +++++++++++++++--------------- ProjectSettings/ProjectVersion.txt | 4 +-- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 1c5207a2c..4c30f6a35 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,20 +2,20 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation.components": "https://github.com/Unity-Technologies/NavMeshComponents.git#package", - "com.unity.cinemachine": "2.8.4", - "com.unity.collab-proxy": "1.15.16", - "com.unity.ide.rider": "3.0.14", - "com.unity.ide.visualstudio": "2.0.14", + "com.unity.cinemachine": "2.8.6", + "com.unity.collab-proxy": "1.17.2", + "com.unity.ide.rider": "3.0.15", + "com.unity.ide.visualstudio": "2.0.16", "com.unity.ide.vscode": "1.2.5", - "com.unity.learn.iet-framework": "2.2.1", + "com.unity.learn.iet-framework": "2.2.2", "com.unity.memoryprofiler": "0.5.0-preview.1", "com.unity.multiplayer.tools": "1.0.0", "com.unity.netcode.gameobjects": "1.0.2", "com.unity.performance.profile-analyzer": "1.1.1", - "com.unity.postprocessing": "3.2.1", - "com.unity.render-pipelines.universal": "12.1.6", + "com.unity.postprocessing": "3.2.2", + "com.unity.render-pipelines.universal": "12.1.7", "com.unity.services.authentication": "2.1.1", - "com.unity.services.lobby": "1.0.0-pre.6", + "com.unity.services.lobby": "1.0.1", "com.unity.services.relay": "1.0.3", "com.unity.test-framework": "1.1.31", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8331f5fa7..6b36491d4 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -16,8 +16,8 @@ "hash": "0fc6f532e4f47d66d173314efcb906bc7cf0d00f" }, "com.unity.burst": { - "version": "1.6.6", - "depth": 2, + "version": "1.7.3", + "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.2.1" @@ -25,14 +25,14 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.8.4", + "version": "2.8.6", "depth": 0, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.15.16", + "version": "1.17.2", "depth": 0, "source": "registry", "dependencies": { @@ -42,7 +42,7 @@ }, "com.unity.collections": { "version": "1.2.4", - "depth": 2, + "depth": 1, "source": "registry", "dependencies": { "com.unity.burst": "1.6.6", @@ -65,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.14", + "version": "3.0.15", "depth": 0, "source": "registry", "dependencies": { @@ -74,7 +74,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.14", + "version": "2.0.16", "depth": 0, "source": "registry", "dependencies": { @@ -90,7 +90,7 @@ "url": "https://packages.unity.com" }, "com.unity.learn.iet-framework": { - "version": "2.2.1", + "version": "2.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -171,7 +171,7 @@ "url": "https://packages.unity.com" }, "com.unity.postprocessing": { - "version": "3.2.1", + "version": "3.2.2", "depth": 0, "source": "registry", "dependencies": { @@ -187,7 +187,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "12.1.6", + "version": "12.1.7", "depth": 1, "source": "builtin", "dependencies": { @@ -197,14 +197,14 @@ } }, "com.unity.render-pipelines.universal": { - "version": "12.1.6", + "version": "12.1.7", "depth": 0, "source": "builtin", "dependencies": { "com.unity.mathematics": "1.2.1", - "com.unity.burst": "1.5.0", - "com.unity.render-pipelines.core": "12.1.6", - "com.unity.shadergraph": "12.1.6" + "com.unity.burst": "1.7.3", + "com.unity.render-pipelines.core": "12.1.7", + "com.unity.shadergraph": "12.1.7" } }, "com.unity.searcher": { @@ -238,18 +238,18 @@ "url": "https://packages.unity.com" }, "com.unity.services.lobby": { - "version": "1.0.0-pre.6", + "version": "1.0.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.1.0-pre.10", + "com.unity.services.core": "1.4.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.nuget.newtonsoft-json": "2.0.0", - "com.unity.services.authentication": "1.0.0-pre.6" + "com.unity.nuget.newtonsoft-json": "3.0.2", + "com.unity.services.authentication": "2.0.0" }, "url": "https://packages.unity.com" }, @@ -292,11 +292,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "12.1.6", + "version": "12.1.7", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "12.1.6", + "com.unity.render-pipelines.core": "12.1.7", "com.unity.searcher": "4.9.1" } }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f62dceeb9..1f883d753 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.2f1 -m_EditorVersionWithRevision: 2021.3.2f1 (79cbdb13f624) +m_EditorVersion: 2021.3.10f1 +m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b) From f19a81f3423daf6081d49c8c460aad5c00e336a7 Mon Sep 17 00:00:00 2001 From: Samuel Bellomo Date: Fri, 23 Sep 2022 15:18:19 -0400 Subject: [PATCH 2/3] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 190a0bd9d..6d1904431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ Additional documentation and release notes are available at [Multiplayer Documen * Instead of a NetworkBehaviour that carries a WinState netvar we now pass the win state on the server to the PostGame scene and it then stores that state in the netvar, eliminating the need to preserve a NetworkBehaviour-bearing gameObject across scenes. (#724) * Bump to NGO 1.0.1 (#720) * Reduced the MaxPacketQueueSize UTP parameter value from 512 to 256 (#728). This reduces the amount of memory used by UTP by around 1 MB. Boss Room does not need a bigger queue size than this because there can only be 7 clients connected to a host and UTP already limits the maximum number of in-flight packets to 32 per connection. -* +* Engine version bump to 2021.3.10f1 (#740) ### Removed * ### Fixed From 7f2e6ed568b9d12a9bdb3d5dc6b448d4a18a17d7 Mon Sep 17 00:00:00 2001 From: Samuel Bellomo Date: Mon, 26 Sep 2022 18:02:11 -0400 Subject: [PATCH 3/3] settings that were updated with the version bump --- ProjectSettings/BurstAotSettings_Android.json | 5 +++-- ProjectSettings/BurstAotSettings_StandaloneOSX.json | 6 +++--- ProjectSettings/ProjectSettings.asset | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json index 751473f15..771d37b73 100644 --- a/ProjectSettings/BurstAotSettings_Android.json +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, @@ -8,6 +8,7 @@ "CpuMinTargetX32": 0, "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, - "CpuMaxTargetX64": 0 + "CpuMaxTargetX64": 0, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/BurstAotSettings_StandaloneOSX.json b/ProjectSettings/BurstAotSettings_StandaloneOSX.json index 541a1ff34..0d835a156 100644 --- a/ProjectSettings/BurstAotSettings_StandaloneOSX.json +++ b/ProjectSettings/BurstAotSettings_StandaloneOSX.json @@ -1,15 +1,15 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "EnableBurstCompilation": false, "EnableOptimisations": false, "EnableSafetyChecks": false, "EnableDebugInAllBuilds": false, - "UsePlatformSDKLinker": false, "CpuMinTargetX32": 0, "CpuMaxTargetX32": 0, "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, - "CpuTargetsX64": 72 + "CpuTargetsX64": 72, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f3a9a3933..dc6beae12 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22bff4aadc61bf7033e3bafc4277b04e81248e4b496679196b782714022a7483 -size 25352 +oid sha256:65bea903fe8f32a67d82e2606b81efd7f8952020ddfe4545b49034e7b6129d4e +size 25451