diff --git a/Submodules/ARCore b/Submodules/ARCore index 22714554c..757009284 160000 --- a/Submodules/ARCore +++ b/Submodules/ARCore @@ -1 +1 @@ -Subproject commit 22714554c83d9194ec05f70c893255174b803895 +Subproject commit 7570092849624046e70c6ffdc6f4ffab4fb43d6b diff --git a/Submodules/Etee b/Submodules/Etee index 3d800481d..bc30d8ad4 160000 --- a/Submodules/Etee +++ b/Submodules/Etee @@ -1 +1 @@ -Subproject commit 3d800481dc64d6c9722407b4bd2f7ec7726be9a1 +Subproject commit bc30d8ad43ceb94743b19e8766ddfdbd978c73fc diff --git a/Submodules/Examples b/Submodules/Examples index f525ff005..19aa36642 160000 --- a/Submodules/Examples +++ b/Submodules/Examples @@ -1 +1 @@ -Subproject commit f525ff0057a392e8ac8fd58231b8a12df605ec03 +Subproject commit 19aa366420fbef9aa4a2e3140a06ecbf7941208c diff --git a/Submodules/Lenovo b/Submodules/Lenovo index 27ce515e4..0dc7af23e 160000 --- a/Submodules/Lenovo +++ b/Submodules/Lenovo @@ -1 +1 @@ -Subproject commit 27ce515e4651762c4d8a82dfb648ffc84af1001d +Subproject commit 0dc7af23e641faeb447e5df3cfa05a3efe94f655 diff --git a/Submodules/Lumin b/Submodules/Lumin index ab9fabbee..faf3f657e 160000 --- a/Submodules/Lumin +++ b/Submodules/Lumin @@ -1 +1 @@ -Subproject commit ab9fabbee9dafeabecaac7aa28730cf087f003aa +Subproject commit faf3f657ef90ce16e91abdbde0d16f9efc854a44 diff --git a/Submodules/Nreal b/Submodules/Nreal index 97d2285dc..012704b05 160000 --- a/Submodules/Nreal +++ b/Submodules/Nreal @@ -1 +1 @@ -Subproject commit 97d2285dce413683cb7a213f7a0c8eaca3637de4 +Subproject commit 012704b05e2bcd4cb392aece9c1795ce91e9eb34 diff --git a/Submodules/Oculus b/Submodules/Oculus index 41e4ecefa..e253103d3 160000 --- a/Submodules/Oculus +++ b/Submodules/Oculus @@ -1 +1 @@ -Subproject commit 41e4ecefa9dafd6622a2acd25f4dc73ca4075fa8 +Subproject commit e253103d3e7d21696b0b3f9a084650471e7c49b1 diff --git a/Submodules/SDK b/Submodules/SDK index 6410dfde9..f2242d688 160000 --- a/Submodules/SDK +++ b/Submodules/SDK @@ -1 +1 @@ -Subproject commit 6410dfde9a801aaf1fd65a0eca9d498c3f63b56c +Subproject commit f2242d688dc47e6f0784d06ed07bde44c8dde44f diff --git a/Submodules/SteamVR b/Submodules/SteamVR index c262376fd..f4745aa90 160000 --- a/Submodules/SteamVR +++ b/Submodules/SteamVR @@ -1 +1 @@ -Subproject commit c262376fd655dc7712230bd633bbbdadbd92a1e1 +Subproject commit f4745aa9057c5a0b174735236c88289c9ae72e93 diff --git a/Submodules/Ultraleap b/Submodules/Ultraleap index 8d9096f17..a086f72f8 160000 --- a/Submodules/Ultraleap +++ b/Submodules/Ultraleap @@ -1 +1 @@ -Subproject commit 8d9096f17c70a221e7e5dcaffb050699029f096e +Subproject commit a086f72f801932bca544fd958405728a6b14f6d7 diff --git a/Submodules/WindowsMixedReality b/Submodules/WindowsMixedReality index 8733bd743..833ce06f4 160000 --- a/Submodules/WindowsMixedReality +++ b/Submodules/WindowsMixedReality @@ -1 +1 @@ -Subproject commit 8733bd7433c6999420276fe16d6cc5ec7a254aaa +Subproject commit 833ce06f4eec55288ceff4b8de97addecbdd219a diff --git a/XRTK-Core/Packages/com.xrtk.core/package.json b/XRTK-Core/Packages/com.xrtk.core/package.json index ba2ad0196..ec714e5ff 100644 --- a/XRTK-Core/Packages/com.xrtk.core/package.json +++ b/XRTK-Core/Packages/com.xrtk.core/package.json @@ -19,7 +19,7 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.textmeshpro": "2.1.3", - "com.unity.xr.legacyinputhelpers": "2.1.6" + "com.unity.xr.legacyinputhelpers": "2.1.7" }, - "unityRelease": "15f1" + "unityRelease": "17f1" } \ No newline at end of file diff --git a/XRTK-Core/Packages/manifest.json b/XRTK-Core/Packages/manifest.json index a1ae25fc3..2bbd6eec1 100644 --- a/XRTK-Core/Packages/manifest.json +++ b/XRTK-Core/Packages/manifest.json @@ -14,7 +14,7 @@ "com.unity.ide.rider": "1.1.4", "com.unity.ide.vscode": "1.2.3", "com.unity.mobile.android-logcat": "1.2.0", - "com.unity.test-framework": "1.1.19", + "com.unity.test-framework": "1.1.20", "com.unity.textmeshpro": "2.1.3", "com.unity.ugui": "1.0.0", "com.unity.xr.magicleap": "4.1.3", diff --git a/XRTK-Core/Packages/packages-lock.json b/XRTK-Core/Packages/packages-lock.json index 07dee68b8..28c56878c 100644 --- a/XRTK-Core/Packages/packages-lock.json +++ b/XRTK-Core/Packages/packages-lock.json @@ -13,7 +13,7 @@ "dependencies": {} }, "com.unity.ext.nunit": { - "version": "1.0.5", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -50,11 +50,11 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.19", + "version": "1.1.20", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.5", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, @@ -97,10 +97,13 @@ "url": "https://packages.unity.com" }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.6", + "version": "2.1.7", "depth": 1, "source": "registry", - "dependencies": {}, + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, "url": "https://packages.unity.com" }, "com.unity.xr.magicleap": { @@ -142,7 +145,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.core": { @@ -154,7 +157,7 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.textmeshpro": "2.1.3", - "com.unity.xr.legacyinputhelpers": "2.1.6" + "com.unity.xr.legacyinputhelpers": "2.1.7" } }, "com.xrtk.etee": { @@ -162,7 +165,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.lenovo": { @@ -170,7 +173,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.lumin": { @@ -178,7 +181,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.171" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.nreal": { @@ -186,7 +189,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.oculus": { @@ -194,7 +197,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.161" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.sdk": { @@ -202,7 +205,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.172", + "com.xrtk.core": "0.2.0-preview.173", "com.unity.textmeshpro": "2.1.3" } }, @@ -211,7 +214,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.ultraleap": { @@ -219,7 +222,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.133" + "com.xrtk.core": "0.2.0-preview.173" } }, "com.xrtk.wmr": { @@ -227,7 +230,7 @@ "depth": 0, "source": "embedded", "dependencies": { - "com.xrtk.core": "0.2.0-preview.171", + "com.xrtk.core": "0.2.0-preview.173", "com.unity.xr.windowsmr.metro": "4.2.3" } }, diff --git a/XRTK-Core/ProjectSettings/ProjectVersion.txt b/XRTK-Core/ProjectSettings/ProjectVersion.txt index 57673098f..88062e3ba 100644 --- a/XRTK-Core/ProjectSettings/ProjectVersion.txt +++ b/XRTK-Core/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.16f1 -m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e) +m_EditorVersion: 2019.4.17f1 +m_EditorVersionWithRevision: 2019.4.17f1 (667c8606c536)