From e7c45de2db420222937a6d445fd29f5ddd373733 Mon Sep 17 00:00:00 2001 From: Toomas Tamm Date: Sat, 13 Feb 2021 16:41:48 +0200 Subject: [PATCH] Update to unity 2020.2.4f and update packages --- .../Settings/Open XR Package Settings.asset | 22 ++++++++++++++ Packages/manifest.json | 8 ++--- Packages/packages-lock.json | 30 ++++++++++--------- ProjectSettings/ProjectVersion.txt | 4 +-- 4 files changed, 44 insertions(+), 20 deletions(-) diff --git a/Assets/XR/Settings/Open XR Package Settings.asset b/Assets/XR/Settings/Open XR Package Settings.asset index f2242cfe..1ff40792 100644 --- a/Assets/XR/Settings/Open XR Package Settings.asset +++ b/Assets/XR/Settings/Open XR Package Settings.asset @@ -201,6 +201,28 @@ MonoBehaviour: company: Unity priority: 0 required: 0 +--- !u!114 &7506780264455515241 +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: 056125dd64c0ed540b40a4af74f7b495, type: 3} + m_Name: RuntimeDebuggerOpenXRFeature Standalone + m_EditorClassIdentifier: + m_enabled: 0 + nameUi: Runtime Debugger + version: 1 + featureIdInternal: com.unity.openxr.features.runtimedebugger + openxrExtensionStrings: + company: Unity + priority: 0 + required: 0 + cacheSize: 1048576 + perThreadCacheSize: 51200 --- !u!114 &7847728422771551327 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Packages/manifest.json b/Packages/manifest.json index 8954a2d9..67c46376 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -5,12 +5,12 @@ "com.unity.collab-proxy": "1.3.9", "com.unity.ext.nunit": "1.0.6", "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.5", + "com.unity.ide.visualstudio": "2.0.7", "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.1.0-preview.3", "com.unity.postprocessing": "3.0.1", "com.unity.progrids": "3.0.3-preview.6", - "com.unity.render-pipelines.universal": "10.2.2", + "com.unity.render-pipelines.universal": "10.3.1", "com.unity.test-framework": "1.1.22", "com.unity.textmeshpro": "3.0.3", "com.unity.timeline": "1.4.6", @@ -18,8 +18,8 @@ "com.unity.xr.interaction.toolkit": "1.0.0-pre.1", "com.unity.xr.management": "3.2.17", "com.unity.xr.oculus": "1.7.0", - "com.unity.xr.openxr": "0.1.2-preview.2", - "com.unity.xr.windowsmr": "4.4.0", + "com.unity.xr.openxr": "1.0.2", + "com.unity.xr.windowsmr": "4.4.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index ce1edeff..9a9bc9ee 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -36,10 +36,12 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.5", + "version": "2.0.7", "depth": 0, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, "url": "https://packages.unity.com" }, "com.unity.ide.vscode": { @@ -80,7 +82,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "10.2.2", + "version": "10.3.1", "depth": 1, "source": "registry", "dependencies": { @@ -89,13 +91,13 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.universal": { - "version": "10.2.2", + "version": "10.3.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.render-pipelines.core": "10.2.2", - "com.unity.shadergraph": "10.2.2" + "com.unity.render-pipelines.core": "10.3.1", + "com.unity.shadergraph": "10.3.1" }, "url": "https://packages.unity.com" }, @@ -114,11 +116,11 @@ "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "10.2.2", + "version": "10.3.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.render-pipelines.core": "10.2.2", + "com.unity.render-pipelines.core": "10.3.1", "com.unity.searcher": "4.3.1" }, "url": "https://packages.unity.com" @@ -211,7 +213,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.management": { - "version": "4.0.0-pre.2", + "version": "4.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -234,25 +236,25 @@ "url": "https://packages.unity.com" }, "com.unity.xr.openxr": { - "version": "0.1.2-preview.2", + "version": "1.0.2", "depth": 0, "source": "registry", "dependencies": { - "com.unity.xr.management": "4.0.0-pre.2", + "com.unity.xr.management": "4.0.1", "com.unity.xr.legacyinputhelpers": "2.1.2", - "com.unity.inputsystem": "1.1.0-preview.1" + "com.unity.inputsystem": "1.0.2" }, "url": "https://packages.unity.com" }, "com.unity.xr.windowsmr": { - "version": "4.4.0", + "version": "4.4.1", "depth": 0, "source": "registry", "dependencies": { "com.unity.modules.subsystems": "1.0.0", "com.unity.modules.vr": "1.0.0", "com.unity.modules.xr": "1.0.0", - "com.unity.xr.management": "3.2.17", + "com.unity.xr.management": "4.0.1", "com.unity.xr.interactionsubsystems": "1.0.1", "com.unity.xr.arsubsystems": "4.0.9" }, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 78a32491..833e6ef6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.2.3f1 -m_EditorVersionWithRevision: 2020.2.3f1 (8ff31bc5bf5b) +m_EditorVersion: 2020.2.4f1 +m_EditorVersionWithRevision: 2020.2.4f1 (becced5a802b)