From 3cf4fce6a465dbf5b3199508fd16faf1426d9bb9 Mon Sep 17 00:00:00 2001
From: Adam Procter <adam.procter@soton.ac.uk>
Date: Thu, 3 Mar 2022 14:22:08 +0000
Subject: [PATCH] updates
---
Assets/XR.meta | 8 +
Assets/XR/Loaders.meta | 8 +
Assets/XR/Loaders/AR Core Loader.asset | 14 +
Assets/XR/Loaders/AR Core Loader.asset.meta | 8 +
Assets/XR/Loaders/AR Kit Loader.asset | 14 +
Assets/XR/Loaders/AR Kit Loader.asset.meta | 8 +
Assets/XR/Settings.meta | 8 +
.../XR/Settings/AR Core Loader Settings.asset | 15 +
.../AR Core Loader Settings.asset.meta | 8 +
.../XR/Settings/AR Kit Loader Settings.asset | 15 +
.../AR Kit Loader Settings.asset.meta | 8 +
Packages/manifest.json | 18 +-
Packages/packages-lock.json | 409 ++++++++++++++++++
ProjectSettings/EditorSettings.asset | 11 +-
ProjectSettings/PackageManagerSettings.asset | 38 ++
ProjectSettings/ProjectSettings.asset | 140 +++---
ProjectSettings/ProjectVersion.txt | 4 +-
ProjectSettings/XRPackageSettings.asset | 5 +
18 files changed, 669 insertions(+), 70 deletions(-)
create mode 100644 Assets/XR.meta
create mode 100644 Assets/XR/Loaders.meta
create mode 100644 Assets/XR/Loaders/AR Core Loader.asset
create mode 100644 Assets/XR/Loaders/AR Core Loader.asset.meta
create mode 100644 Assets/XR/Loaders/AR Kit Loader.asset
create mode 100644 Assets/XR/Loaders/AR Kit Loader.asset.meta
create mode 100644 Assets/XR/Settings.meta
create mode 100644 Assets/XR/Settings/AR Core Loader Settings.asset
create mode 100644 Assets/XR/Settings/AR Core Loader Settings.asset.meta
create mode 100644 Assets/XR/Settings/AR Kit Loader Settings.asset
create mode 100644 Assets/XR/Settings/AR Kit Loader Settings.asset.meta
create mode 100644 Packages/packages-lock.json
create mode 100644 ProjectSettings/PackageManagerSettings.asset
create mode 100644 ProjectSettings/XRPackageSettings.asset
diff --git a/Assets/XR.meta b/Assets/XR.meta
new file mode 100644
index 0000000..fe1882f
--- /dev/null
+++ b/Assets/XR.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3dee24fdb3ddc4e9dbda8ec38233f2ac
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Loaders.meta b/Assets/XR/Loaders.meta
new file mode 100644
index 0000000..574e12e
--- /dev/null
+++ b/Assets/XR/Loaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1b2cc5e9c6bbe4addbaa1b98fd935738
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Loaders/AR Core Loader.asset b/Assets/XR/Loaders/AR Core Loader.asset
new file mode 100644
index 0000000..f7015e0
--- /dev/null
+++ b/Assets/XR/Loaders/AR Core Loader.asset
@@ -0,0 +1,14 @@
+%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: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
+ m_Name: AR Core Loader
+ m_EditorClassIdentifier:
diff --git a/Assets/XR/Loaders/AR Core Loader.asset.meta b/Assets/XR/Loaders/AR Core Loader.asset.meta
new file mode 100644
index 0000000..404a67c
--- /dev/null
+++ b/Assets/XR/Loaders/AR Core Loader.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7fd5ad14ecaef496d8e0696213bc4577
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Loaders/AR Kit Loader.asset b/Assets/XR/Loaders/AR Kit Loader.asset
new file mode 100644
index 0000000..a337dd4
--- /dev/null
+++ b/Assets/XR/Loaders/AR Kit Loader.asset
@@ -0,0 +1,14 @@
+%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: a18c4d6661b404073b154020b9e2d993, type: 3}
+ m_Name: AR Kit Loader
+ m_EditorClassIdentifier:
diff --git a/Assets/XR/Loaders/AR Kit Loader.asset.meta b/Assets/XR/Loaders/AR Kit Loader.asset.meta
new file mode 100644
index 0000000..228ca61
--- /dev/null
+++ b/Assets/XR/Loaders/AR Kit Loader.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97b886189c56c49a7b2a9340af25d29c
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Settings.meta b/Assets/XR/Settings.meta
new file mode 100644
index 0000000..8ebd351
--- /dev/null
+++ b/Assets/XR/Settings.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 12f1f8f04a82243ccb3a3fdd4e80f6ab
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Settings/AR Core Loader Settings.asset b/Assets/XR/Settings/AR Core Loader Settings.asset
new file mode 100644
index 0000000..4c9d784
--- /dev/null
+++ b/Assets/XR/Settings/AR Core Loader Settings.asset
@@ -0,0 +1,15 @@
+%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: 00cb13c61b2744fd786f9f969ce96149, type: 3}
+ m_Name: AR Core Loader Settings
+ m_EditorClassIdentifier:
+ m_StartAndStopSubsystems: 0
diff --git a/Assets/XR/Settings/AR Core Loader Settings.asset.meta b/Assets/XR/Settings/AR Core Loader Settings.asset.meta
new file mode 100644
index 0000000..e050974
--- /dev/null
+++ b/Assets/XR/Settings/AR Core Loader Settings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f2e9c6c9e3d7047cdaa3cfe4a5aa19c1
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/XR/Settings/AR Kit Loader Settings.asset b/Assets/XR/Settings/AR Kit Loader Settings.asset
new file mode 100644
index 0000000..5ff2785
--- /dev/null
+++ b/Assets/XR/Settings/AR Kit Loader Settings.asset
@@ -0,0 +1,15 @@
+%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: 9cac560dd573c4c5088432b9d202f3e7, type: 3}
+ m_Name: AR Kit Loader Settings
+ m_EditorClassIdentifier:
+ m_StartAndStopSubsystems: 0
diff --git a/Assets/XR/Settings/AR Kit Loader Settings.asset.meta b/Assets/XR/Settings/AR Kit Loader Settings.asset.meta
new file mode 100644
index 0000000..18293e8
--- /dev/null
+++ b/Assets/XR/Settings/AR Kit Loader Settings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 037c53828ec4d4c6e90a4a9022ab11f9
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 11400000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index a3b4b4b..44dd9ef 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,17 +1,17 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.2.16",
- "com.unity.ext.nunit": "1.0.0",
- "com.unity.ide.rider": "1.1.0",
- "com.unity.ide.vscode": "1.1.3",
- "com.unity.package-manager-ui": "2.2.0",
- "com.unity.test-framework": "1.0.13",
+ "com.unity.ext.nunit": "1.0.6",
+ "com.unity.ide.rider": "1.1.4",
+ "com.unity.ide.vscode": "1.2.3",
+ "com.unity.test-framework": "1.1.22",
"com.unity.textmeshpro": "2.0.1",
- "com.unity.timeline": "1.1.0",
+ "com.unity.timeline": "1.2.18",
+ "com.unity.toolchain.macos-x86_64-linux-x86_64": "1.0.0",
"com.unity.ugui": "1.0.0",
- "com.unity.xr.arcore": "2.0.2",
- "com.unity.xr.arfoundation": "2.0.2",
- "com.unity.xr.arkit": "2.0.1",
+ "com.unity.xr.arcore": "2.1.14",
+ "com.unity.xr.arfoundation": "2.1.14",
+ "com.unity.xr.arkit": "2.1.14",
"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
new file mode 100644
index 0000000..3ec48ca
--- /dev/null
+++ b/Packages/packages-lock.json
@@ -0,0 +1,409 @@
+{
+ "dependencies": {
+ "com.unity.collab-proxy": {
+ "version": "1.2.16",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.ext.nunit": {
+ "version": "1.0.6",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.ide.rider": {
+ "version": "1.1.4",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.test-framework": "1.1.1"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.ide.vscode": {
+ "version": "1.2.3",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.subsystemregistration": {
+ "version": "1.0.6",
+ "depth": 2,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.sysroot": {
+ "version": "1.0.0",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {},
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.sysroot.linux-x86_64": {
+ "version": "1.0.0",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.sysroot": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.test-framework": {
+ "version": "1.1.22",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.ext.nunit": "1.0.6",
+ "com.unity.modules.imgui": "1.0.0",
+ "com.unity.modules.jsonserialize": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.textmeshpro": {
+ "version": "2.0.1",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.ugui": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.timeline": {
+ "version": "1.2.18",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.modules.director": "1.0.0",
+ "com.unity.modules.animation": "1.0.0",
+ "com.unity.modules.audio": "1.0.0",
+ "com.unity.modules.particlesystem": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.toolchain.macos-x86_64-linux-x86_64": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.sysroot": "1.0.0",
+ "com.unity.sysroot.linux-x86_64": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.ugui": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.ui": "1.0.0",
+ "com.unity.modules.imgui": "1.0.0"
+ }
+ },
+ "com.unity.xr.arcore": {
+ "version": "2.1.14",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.xr.arsubsystems": "2.1.14",
+ "com.unity.xr.management": "3.2.17"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.arfoundation": {
+ "version": "2.1.14",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.xr.legacyinputhelpers": "2.1.7",
+ "com.unity.xr.arsubsystems": "2.1.14"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.arkit": {
+ "version": "2.1.14",
+ "depth": 0,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.xr.arsubsystems": "2.1.14",
+ "com.unity.xr.management": "3.2.17"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.arsubsystems": {
+ "version": "2.1.14",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.subsystemregistration": "1.0.6"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.legacyinputhelpers": {
+ "version": "2.1.7",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.modules.vr": "1.0.0",
+ "com.unity.modules.xr": "1.0.0"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.xr.management": {
+ "version": "3.2.17",
+ "depth": 1,
+ "source": "registry",
+ "dependencies": {
+ "com.unity.xr.legacyinputhelpers": "2.1.2",
+ "com.unity.subsystemregistration": "1.0.6"
+ },
+ "url": "https://packages.unity.com"
+ },
+ "com.unity.modules.ai": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.androidjni": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.animation": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.assetbundle": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.audio": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.cloth": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.physics": "1.0.0"
+ }
+ },
+ "com.unity.modules.director": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.audio": "1.0.0",
+ "com.unity.modules.animation": "1.0.0"
+ }
+ },
+ "com.unity.modules.imageconversion": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.imgui": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.jsonserialize": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.particlesystem": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.physics": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.physics2d": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.screencapture": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.imageconversion": "1.0.0"
+ }
+ },
+ "com.unity.modules.subsystems": {
+ "version": "1.0.0",
+ "depth": 1,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.jsonserialize": "1.0.0"
+ }
+ },
+ "com.unity.modules.terrain": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.terrainphysics": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.physics": "1.0.0",
+ "com.unity.modules.terrain": "1.0.0"
+ }
+ },
+ "com.unity.modules.tilemap": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.physics2d": "1.0.0"
+ }
+ },
+ "com.unity.modules.ui": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.uielements": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.imgui": "1.0.0",
+ "com.unity.modules.jsonserialize": "1.0.0"
+ }
+ },
+ "com.unity.modules.umbra": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.unityanalytics": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.unitywebrequest": "1.0.0",
+ "com.unity.modules.jsonserialize": "1.0.0"
+ }
+ },
+ "com.unity.modules.unitywebrequest": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.unitywebrequestassetbundle": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.assetbundle": "1.0.0",
+ "com.unity.modules.unitywebrequest": "1.0.0"
+ }
+ },
+ "com.unity.modules.unitywebrequestaudio": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.unitywebrequest": "1.0.0",
+ "com.unity.modules.audio": "1.0.0"
+ }
+ },
+ "com.unity.modules.unitywebrequesttexture": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.unitywebrequest": "1.0.0",
+ "com.unity.modules.imageconversion": "1.0.0"
+ }
+ },
+ "com.unity.modules.unitywebrequestwww": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.unitywebrequest": "1.0.0",
+ "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+ "com.unity.modules.unitywebrequestaudio": "1.0.0",
+ "com.unity.modules.audio": "1.0.0",
+ "com.unity.modules.assetbundle": "1.0.0",
+ "com.unity.modules.imageconversion": "1.0.0"
+ }
+ },
+ "com.unity.modules.vehicles": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.physics": "1.0.0"
+ }
+ },
+ "com.unity.modules.video": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.audio": "1.0.0",
+ "com.unity.modules.ui": "1.0.0",
+ "com.unity.modules.unitywebrequest": "1.0.0"
+ }
+ },
+ "com.unity.modules.vr": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.jsonserialize": "1.0.0",
+ "com.unity.modules.physics": "1.0.0",
+ "com.unity.modules.xr": "1.0.0"
+ }
+ },
+ "com.unity.modules.wind": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {}
+ },
+ "com.unity.modules.xr": {
+ "version": "1.0.0",
+ "depth": 0,
+ "source": "builtin",
+ "dependencies": {
+ "com.unity.modules.physics": "1.0.0",
+ "com.unity.modules.jsonserialize": "1.0.0",
+ "com.unity.modules.subsystems": "1.0.0"
+ }
+ }
+ }
+}
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
index 2569d13..4af553a 100644
--- a/ProjectSettings/EditorSettings.asset
+++ b/ProjectSettings/EditorSettings.asset
@@ -3,7 +3,7 @@
--- !u!159 &1
EditorSettings:
m_ObjectHideFlags: 0
- serializedVersion: 8
+ serializedVersion: 9
m_ExternalVersionControlSupport: Hidden Meta Files
m_SerializationMode: 2
m_LineEndingsForNewScripts: 2
@@ -23,4 +23,13 @@ EditorSettings:
m_EnableTextureStreamingInEditMode: 1
m_EnableTextureStreamingInPlayMode: 1
m_AsyncShaderCompilation: 1
+ m_EnterPlayModeOptionsEnabled: 0
+ m_EnterPlayModeOptions: 3
m_ShowLightmapResolutionOverlay: 1
+ m_UseLegacyProbeSampleCount: 1
+ m_AssetPipelineMode: 1
+ m_CacheServerMode: 0
+ m_CacheServerEndpoint:
+ m_CacheServerNamespacePrefix: default
+ m_CacheServerEnableDownload: 1
+ m_CacheServerEnableUpload: 1
diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset
new file mode 100644
index 0000000..6920e3a
--- /dev/null
+++ b/ProjectSettings/PackageManagerSettings.asset
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &1
+MonoBehaviour:
+ m_ObjectHideFlags: 61
+ 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: 13964, guid: 0000000000000000e000000000000000, type: 0}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ScopedRegistriesSettingsExpanded: 1
+ oneTimeWarningShown: 0
+ m_Registries:
+ - m_Id: main
+ m_Name:
+ m_Url: https://packages.unity.com
+ m_Scopes: []
+ m_IsDefault: 1
+ m_UserSelectedRegistryName:
+ m_UserAddingNewScopedRegistry: 0
+ m_RegistryInfoDraft:
+ m_ErrorMessage:
+ m_Original:
+ m_Id:
+ m_Name:
+ m_Url:
+ m_Scopes: []
+ m_IsDefault: 0
+ m_Modified: 0
+ m_Name:
+ m_Url:
+ m_Scopes:
+ -
+ m_SelectedScopeIndex: 0
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index d66c754..a99818e 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -3,7 +3,7 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
- serializedVersion: 18
+ serializedVersion: 20
productGUID: e4ce1074c248747b08e0ab9c75b883c9
AndroidProfiler: 0
AndroidFilterTouchesWhenObscured: 0
@@ -52,7 +52,6 @@ PlayerSettings:
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
- displayResolutionDialog: 0
iosUseCustomAppBackgroundBehavior: 0
iosAllowHTTPDownload: 1
allowedAutorotateToPortrait: 1
@@ -85,7 +84,6 @@ PlayerSettings:
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
gpuSkinning: 1
- graphicsJobs: 0
xboxPIXTextureCapture: 0
xboxEnableAvatar: 0
xboxEnableKinect: 0
@@ -93,7 +91,6 @@ PlayerSettings:
xboxEnableFitness: 0
visibleInBackground: 1
allowFullscreenSwitch: 1
- graphicsJobMode: 0
fullscreenMode: 1
xboxSpeechDB: 0
xboxEnableHeadOrientation: 0
@@ -106,6 +103,7 @@ PlayerSettings:
xboxOneMonoLoggingLevel: 0
xboxOneLoggingLevel: 1
xboxOneDisableEsram: 0
+ xboxOneEnableTypeOptimization: 0
xboxOnePresentImmediateThreshold: 0
switchQueueCommandMemory: 0
switchQueueControlMemory: 16384
@@ -113,7 +111,13 @@ PlayerSettings:
switchNVNShaderPoolsGranularity: 33554432
switchNVNDefaultPoolsGranularity: 16777216
switchNVNOtherPoolsGranularity: 16777216
+ switchNVNMaxPublicTextureIDCount: 0
+ switchNVNMaxPublicSamplerIDCount: 0
+ stadiaPresentMode: 0
+ stadiaTargetFramerate: 0
+ vulkanNumSwapchainBuffers: 3
vulkanEnableSetSRGBWrite: 0
+ vulkanEnableLateAcquireNextImage: 0
m_SupportedAspectRatios:
4:3: 1
5:4: 1
@@ -155,9 +159,9 @@ PlayerSettings:
v2Signing: 0
enable360StereoCapture: 0
isWsaHolographicRemotingEnabled: 0
- protectGraphicsMemory: 0
enableFrameTimingStats: 0
useHDRDisplay: 0
+ D3DHDRBitDepth: 0
m_ColorGamuts: 00000000
targetPixelDensity: 30
resolutionScalingMode: 0
@@ -166,7 +170,7 @@ PlayerSettings:
applicationIdentifier: {}
buildNumber: {}
AndroidBundleVersionCode: 1
- AndroidMinSdkVersion: 16
+ AndroidMinSdkVersion: 19
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
aotOptions:
@@ -184,29 +188,13 @@ PlayerSettings:
iOSTargetOSVersionString: 11.0
tvOSSdkVersion: 0
tvOSRequireExtendedGameController: 0
- tvOSTargetOSVersionString: 9.0
+ tvOSTargetOSVersionString: 10.0
uIPrerenderedIcon: 0
uIRequiresPersistentWiFi: 0
uIRequiresFullScreen: 1
uIStatusBarHidden: 1
uIExitOnSuspend: 0
uIStatusBarStyle: 0
- iPhoneSplashScreen: {fileID: 0}
- iPhoneHighResSplashScreen: {fileID: 0}
- iPhoneTallHighResSplashScreen: {fileID: 0}
- iPhone47inSplashScreen: {fileID: 0}
- iPhone55inPortraitSplashScreen: {fileID: 0}
- iPhone55inLandscapeSplashScreen: {fileID: 0}
- iPhone58inPortraitSplashScreen: {fileID: 0}
- iPhone58inLandscapeSplashScreen: {fileID: 0}
- iPadPortraitSplashScreen: {fileID: 0}
- iPadHighResPortraitSplashScreen: {fileID: 0}
- iPadLandscapeSplashScreen: {fileID: 0}
- iPadHighResLandscapeSplashScreen: {fileID: 0}
- iPhone65inPortraitSplashScreen: {fileID: 0}
- iPhone65inLandscapeSplashScreen: {fileID: 0}
- iPhone61inPortraitSplashScreen: {fileID: 0}
- iPhone61inLandscapeSplashScreen: {fileID: 0}
appleTVSplashScreen: {fileID: 0}
appleTVSplashScreen2x: {fileID: 0}
tvOSSmallIconLayers: []
@@ -243,6 +231,7 @@ PlayerSettings:
metalEditorSupport: 1
metalAPIValidation: 1
iOSRenderExtraFrameOnPause: 0
+ iosCopyPluginsCodeInsteadOfSymlink: 0
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:
@@ -274,36 +263,10 @@ PlayerSettings:
androidGamepadSupportLevel: 0
AndroidValidateAppBundleSize: 1
AndroidAppBundleSizeToValidate: 150
- resolutionDialogBanner: {fileID: 0}
m_BuildTargetIcons: []
m_BuildTargetPlatformIcons:
- m_BuildTarget: iPhone
m_Icons:
- - m_Textures: []
- m_Width: 180
- m_Height: 180
- m_Kind: 0
- m_SubKind: iPhone
- - m_Textures: []
- m_Width: 120
- m_Height: 120
- m_Kind: 0
- m_SubKind: iPhone
- - m_Textures: []
- m_Width: 167
- m_Height: 167
- m_Kind: 0
- m_SubKind: iPad
- - m_Textures: []
- m_Width: 152
- m_Height: 152
- m_Kind: 0
- m_SubKind: iPad
- - m_Textures: []
- m_Width: 76
- m_Height: 76
- m_Kind: 0
- m_SubKind: iPad
- m_Textures: []
m_Width: 120
m_Height: 120
@@ -374,6 +337,34 @@ PlayerSettings:
m_Height: 1024
m_Kind: 4
m_SubKind: App Store
+ - m_Textures: []
+ m_Width: 180
+ m_Height: 180
+ m_Kind: 0
+ m_SubKind: iPhone
+ - m_Textures: []
+ m_Width: 120
+ m_Height: 120
+ m_Kind: 0
+ m_SubKind: iPhone
+ - m_Textures:
+ - {fileID: 0}
+ m_Width: 167
+ m_Height: 167
+ m_Kind: 0
+ m_SubKind: iPad
+ - m_Textures:
+ - {fileID: 0}
+ m_Width: 152
+ m_Height: 152
+ m_Kind: 0
+ m_SubKind: iPad
+ - m_Textures:
+ - {fileID: 0}
+ m_Width: 76
+ m_Height: 76
+ m_Kind: 0
+ m_SubKind: iPad
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1
@@ -390,6 +381,40 @@ PlayerSettings:
- m_BuildTarget: WebGL
m_StaticBatching: 0
m_DynamicBatching: 0
+ m_BuildTargetGraphicsJobs:
+ - m_BuildTarget: MacStandaloneSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: Switch
+ m_GraphicsJobs: 0
+ - m_BuildTarget: MetroSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: AppleTVSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: BJMSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: LinuxStandaloneSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: PS4Player
+ m_GraphicsJobs: 0
+ - m_BuildTarget: iOSSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: WindowsStandaloneSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: XboxOnePlayer
+ m_GraphicsJobs: 0
+ - m_BuildTarget: LuminSupport
+ m_GraphicsJobs: 0
+ - m_BuildTarget: CloudRendering
+ m_GraphicsJobs: 0
+ - m_BuildTarget: AndroidPlayer
+ m_GraphicsJobs: 0
+ - m_BuildTarget: WebGLSupport
+ m_GraphicsJobs: 0
+ m_BuildTargetGraphicsJobMode:
+ - m_BuildTarget: PS4Player
+ m_GraphicsJobMode: 0
+ - m_BuildTarget: XboxOnePlayer
+ m_GraphicsJobMode: 0
m_BuildTargetGraphicsAPIs:
- m_BuildTarget: AndroidPlayer
m_APIs: 150000000b000000
@@ -412,7 +437,6 @@ PlayerSettings:
openGLRequireES31: 0
openGLRequireES31AEP: 0
openGLRequireES32: 0
- vuforiaEnabled: 0
m_TemplateCustomTags: {}
mobileMTRendering:
Android: 1
@@ -585,6 +609,7 @@ PlayerSettings:
ps4ShareFilePath:
ps4ShareOverlayImagePath:
ps4PrivacyGuardImagePath:
+ ps4ExtraSceSysFile:
ps4NPtitleDatPath:
ps4RemotePlayKeyAssignment: -1
ps4RemotePlayKeyMappingDir:
@@ -610,6 +635,7 @@ PlayerSettings:
ps4UseResolutionFallback: 0
ps4ReprojectionSupport: 0
ps4UseAudio3dBackend: 0
+ ps4UseLowGarlicFragmentationMode: 1
ps4SocialScreenEnabled: 0
ps4ScriptOptimizationLevel: 0
ps4Audio3dVirtualSpeakerCount: 14
@@ -626,8 +652,11 @@ PlayerSettings:
ps4disableAutoHideSplash: 0
ps4videoRecordingFeaturesUsed: 0
ps4contentSearchFeaturesUsed: 0
+ ps4CompatibilityPS5: 0
+ ps4GPU800MHz: 1
ps4attribEyeToEyeDistanceSettingVR: 0
ps4IncludedModules: []
+ ps4attribVROutputEnabled: 0
monoEnv:
splashScreenBackgroundSourceLandscape: {fileID: 0}
splashScreenBackgroundSourcePortrait: {fileID: 0}
@@ -658,6 +687,7 @@ PlayerSettings:
additionalIl2CppArgs:
scriptingRuntimeVersion: 1
gcIncremental: 0
+ assemblyVersionValidation: 1
gcWBarrierValidation: 0
apiCompatibilityLevelPerPlatform: {}
m_RenderingPath: 1
@@ -707,14 +737,15 @@ PlayerSettings:
XboxOneCapability: []
XboxOneGameRating: {}
XboxOneIsContentPackage: 0
+ XboxOneEnhancedXboxCompatibilityMode: 0
XboxOneEnableGPUVariability: 1
XboxOneSockets: {}
XboxOneSplashScreen: {fileID: 0}
XboxOneAllowedProductIds: []
XboxOnePersistentLocalStorageSize: 0
XboxOneXTitleMemory: 8
- xboxOneScriptCompiler: 1
XboxOneOverrideIdentityName:
+ XboxOneOverrideIdentityPublisher:
vrEditorSettings:
daydream:
daydreamIconForeground: {fileID: 0}
@@ -732,13 +763,6 @@ PlayerSettings:
luminVersion:
m_VersionCode: 1
m_VersionName:
- facebookSdkVersion: 7.9.4
- facebookAppId:
- facebookCookies: 1
- facebookLogging: 1
- facebookStatus: 1
- facebookXfbml: 0
- facebookFrictionlessRequests: 1
apiCompatibilityLevel: 6
cloudProjectId:
framebufferDepthMemorylessMode: 0
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index fe698d0..c1369e4 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.2.14f1
-m_EditorVersionWithRevision: 2019.2.14f1 (49dd4e9fa428)
+m_EditorVersion: 2019.4.21f1
+m_EditorVersionWithRevision: 2019.4.21f1 (b76dac84db26)
diff --git a/ProjectSettings/XRPackageSettings.asset b/ProjectSettings/XRPackageSettings.asset
new file mode 100644
index 0000000..7e791e1
--- /dev/null
+++ b/ProjectSettings/XRPackageSettings.asset
@@ -0,0 +1,5 @@
+{
+ "m_Settings": [
+ "RemoveLegacyInputHelpersForReload"
+ ]
+}
\ No newline at end of file
--
GitLab