Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev/2019.4.17f1 #737

Merged
merged 4 commits into from
Dec 23, 2020
Merged

Dev/2019.4.17f1 #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f57e05
Updated project to 2019.4.17f1
Dec 22, 2020
21e461e
missed project version file update
Dec 22, 2020
299f395
updated packages lock file
Dec 22, 2020
8d47448
updated submodules
Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Submodules/ARCore
Open in desktop
Submodule ARCore updated from 227145 to 757009
2 changes: 1 addition & 1 deletion Submodules/Etee
Open in desktop
Submodule Etee updated from 3d8004 to bc30d8
2 changes: 1 addition & 1 deletion Submodules/Examples
Open in desktop
Submodule Examples updated 4 files
+5 −5 XRTK.Examples/Assets/XRTK.Generated/SymbolicLinkSettings.asset
+6 −6 XRTK.Examples/Packages/manifest.json
+12 −12 XRTK.Examples/Packages/packages-lock.json
+2 −2 XRTK.Examples/ProjectSettings/ProjectVersion.txt
2 changes: 1 addition & 1 deletion Submodules/Lenovo
Open in desktop
Submodule Lenovo updated from 27ce51 to 0dc7af
2 changes: 1 addition & 1 deletion Submodules/Lumin
Open in desktop
Submodule Lumin updated from ab9fab to faf3f6
2 changes: 1 addition & 1 deletion Submodules/Nreal
Open in desktop
Submodule Nreal updated from 97d228 to 012704
2 changes: 1 addition & 1 deletion Submodules/Oculus
Open in desktop
Submodule Oculus updated from 41e4ec to e25310
2 changes: 1 addition & 1 deletion Submodules/SDK
Open in desktop
Submodule SDK updated from 6410df to f2242d
2 changes: 1 addition & 1 deletion Submodules/SteamVR
Open in desktop
Submodule SteamVR updated from c26237 to f4745a
2 changes: 1 addition & 1 deletion Submodules/Ultraleap
Open in desktop
Submodule Ultraleap updated from 8d9096 to a086f7
2 changes: 1 addition & 1 deletion Submodules/WindowsMixedReality
Open in desktop
Submodule WindowsMixedReality updated from 8733bd to 833ce0
4 changes: 2 additions & 2 deletions XRTK-Core/Packages/com.xrtk.core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
2 changes: 1 addition & 1 deletion XRTK-Core/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
35 changes: 19 additions & 16 deletions XRTK-Core/Packages/packages-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {}
},
"com.unity.ext.nunit": {
"version": "1.0.5",
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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": {
Expand All @@ -154,55 +157,55 @@
"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": {
"version": "file:com.xrtk.etee",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.133"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.lenovo": {
"version": "file:com.xrtk.lenovo",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.133"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.lumin": {
"version": "file:com.xrtk.lumin",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.171"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.nreal": {
"version": "file:com.xrtk.nreal",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.133"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.oculus": {
"version": "file:com.xrtk.oculus",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.161"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.sdk": {
"version": "file:com.xrtk.sdk",
"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"
}
},
Expand All @@ -211,23 +214,23 @@
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.133"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.ultraleap": {
"version": "file:com.xrtk.ultraleap",
"depth": 0,
"source": "embedded",
"dependencies": {
"com.xrtk.core": "0.2.0-preview.133"
"com.xrtk.core": "0.2.0-preview.173"
}
},
"com.xrtk.wmr": {
"version": "file:com.xrtk.wmr",
"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"
}
},
Expand Down
4 changes: 2 additions & 2 deletions XRTK-Core/ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)