From efeba26351a3a8beb091676366c6a9c1aeecade6 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sat, 27 Apr 2019 15:33:11 -0700 Subject: [PATCH] updated editor to 2019.1 (#16) updated packages --- .../Packages/manifest.json | 32 +++++++++++-------- .../ProjectSettings/ProjectVersion.txt | 3 +- .../ProjectSettings/XRSettings.asset | 10 ++++++ 3 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 XRTK.WindowsMixedReality/ProjectSettings/XRSettings.asset diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json index 33fb0fe..605fa7a 100644 --- a/XRTK.WindowsMixedReality/Packages/manifest.json +++ b/XRTK.WindowsMixedReality/Packages/manifest.json @@ -1,10 +1,12 @@ { "dependencies": { - "com.unity.analytics": "3.2.2", - "com.unity.package-manager-ui": "2.0.7", - "com.unity.xr.windowsmr.metro": "1.0.9", - "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.3", - "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.2", + "com.unity.analytics": "3.3.2", + "com.unity.package-manager-ui": "2.1.2", + "com.unity.xr.legacyinputhelpers": "2.0.2", + "com.unity.xr.windowsmr.metro": "1.0.8", + "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.4", + "com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.0", + "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.3", "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.4", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", @@ -38,17 +40,21 @@ "com.unity.modules.xr": "1.0.0" }, "lock": { - "com.xrtk.upm-git-extension": { - "hash": "869a63adece6138e88881e85f89f7994983db696", - "revision": "0.9.4" - }, "com.xrtk.core": { - "hash": "6b85982fd9d9f6f44d46074e8956b3d53ce2a48e", - "revision": "0.1.3" + "hash": "925940cff60d2619045d6624c03989d96feacb91", + "revision": "0.1.4" + }, + "com.xrtk.lumin": { + "hash": "cf91e467e7151a830e36d39ecad2cd34cff32ae0", + "revision": "0.1.0" }, "com.xrtk.sdk": { - "hash": "783847ae6aed405fc1ef5af62e9b4a014d01901f", - "revision": "0.1.2" + "hash": "26e330d9da9910895760eca9674d3c9101548cfe", + "revision": "0.1.3" + }, + "com.xrtk.upm-git-extension": { + "hash": "869a63adece6138e88881e85f89f7994983db696", + "revision": "0.9.4" } } } diff --git a/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt b/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt index 6b2f366..241ebd0 100644 --- a/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt +++ b/XRTK.WindowsMixedReality/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.3.13f1 +m_EditorVersion: 2019.1.0f2 +m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c) diff --git a/XRTK.WindowsMixedReality/ProjectSettings/XRSettings.asset b/XRTK.WindowsMixedReality/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/XRTK.WindowsMixedReality/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file