From 84c089ee42771a9ad54de93ad30c1c0f80f49920 Mon Sep 17 00:00:00 2001 From: Eric Date: Thu, 30 Apr 2020 11:57:55 -0400 Subject: [PATCH] Changes for v0.6.2 - Update SDK to v16 - Fixed Bug #44 - Removed controller rendering by default as new SDK renders wrong controllers anyway - Update version to 0.6.2 --- .../Prefabs/MRTK-Quest_HandsPrefab.prefab | 10 -------- .../Prefabs/MRTK-Quest_LocalAvatar.prefab | 6 +---- .../Prefabs/MRTK-Quest_OVRCameraRig.prefab | 4 ++-- Assets/Resources/OVRBuildConfig.asset | 2 +- .../Resources/OVRPlatformToolSettings.asset | 23 +++++++++++++++++++ .../OVRPlatformToolSettings.asset.meta | 8 +++++++ ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 2 +- 8 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 Assets/Resources/OVRPlatformToolSettings.asset create mode 100644 Assets/Resources/OVRPlatformToolSettings.asset.meta diff --git a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_HandsPrefab.prefab b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_HandsPrefab.prefab index 912041d..ba86067 100644 --- a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_HandsPrefab.prefab +++ b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_HandsPrefab.prefab @@ -55,20 +55,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114252240061623322, guid: 835e735ca71bf78459fb2cababd74112, - type: 3} - propertyPath: _confidenceBehavior - value: 0 - objectReference: {fileID: 0} - target: {fileID: 114252240061623322, guid: 835e735ca71bf78459fb2cababd74112, type: 3} propertyPath: _systemGestureBehavior value: 0 objectReference: {fileID: 0} - - target: {fileID: 114392993255165844, guid: 835e735ca71bf78459fb2cababd74112, - type: 3} - propertyPath: _confidenceBehavior - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 835e735ca71bf78459fb2cababd74112, type: 3} diff --git a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_LocalAvatar.prefab b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_LocalAvatar.prefab index 7fca3a6..ae05dd8 100644 --- a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_LocalAvatar.prefab +++ b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_LocalAvatar.prefab @@ -9,7 +9,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 158226, guid: 84c8b8609f9bb434eaf5248f17ff1293, type: 3} propertyPath: m_Name - value: MRTK_LocalAvatar Variant + value: MRTK-Quest_LocalAvatar objectReference: {fileID: 0} - target: {fileID: 463470, guid: 84c8b8609f9bb434eaf5248f17ff1293, type: 3} propertyPath: m_LocalPosition.x @@ -87,10 +87,6 @@ PrefabInstance: propertyPath: EnableLaughter value: 0 objectReference: {fileID: 0} - - target: {fileID: 11437430, guid: 84c8b8609f9bb434eaf5248f17ff1293, type: 3} - propertyPath: StartWithControllers - value: 1 - objectReference: {fileID: 0} - target: {fileID: 11437430, guid: 84c8b8609f9bb434eaf5248f17ff1293, type: 3} propertyPath: ControllerShader value: diff --git a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_OVRCameraRig.prefab b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_OVRCameraRig.prefab index e00503b..704140f 100644 --- a/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_OVRCameraRig.prefab +++ b/Assets/MixedRealityToolkit.ThirdParty/MRTK-Quest/Prefabs/MRTK-Quest_OVRCameraRig.prefab @@ -10,7 +10,7 @@ PrefabInstance: - target: {fileID: 5969386144478096416, guid: 1370eb7f88d2e6b439cffbeabf3569b2, type: 3} propertyPath: m_Name - value: OVRHandPrefab_Rigth + value: OVRHandPrefab_Right objectReference: {fileID: 0} - target: {fileID: 5971477318110852390, guid: 1370eb7f88d2e6b439cffbeabf3569b2, type: 3} @@ -172,7 +172,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 100004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} propertyPath: m_Name - value: OVRCameraRig Variant + value: MRTK-Quest_OVRCameraRig objectReference: {fileID: 0} - target: {fileID: 400004, guid: 126d619cf4daa52469682f85c1378b4a, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset index cf5cd6c..e880639 100644 --- a/Assets/Resources/OVRBuildConfig.asset +++ b/Assets/Resources/OVRBuildConfig.asset @@ -12,6 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3} m_Name: OVRBuildConfig m_EditorClassIdentifier: - androidSDKPath: + androidSDKPath: C:\Users\eprov\AppData\Local\Android\sdk gradlePath: jdkPath: diff --git a/Assets/Resources/OVRPlatformToolSettings.asset b/Assets/Resources/OVRPlatformToolSettings.asset new file mode 100644 index 0000000..3f4a7ca --- /dev/null +++ b/Assets/Resources/OVRPlatformToolSettings.asset @@ -0,0 +1,23 @@ +%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: cd7bb81df5b74b34dadbf531f381a26b, type: 3} + m_Name: OVRPlatformToolSettings + m_EditorClassIdentifier: + riftRedistPackages: [] + languagePackDirectory: + assetConfigs: + - configList: [] + - configList: [] + - configList: [] + targetPlatform: 3 + runOvrLint: 1 + skipUnneededShaders: 1 diff --git a/Assets/Resources/OVRPlatformToolSettings.asset.meta b/Assets/Resources/OVRPlatformToolSettings.asset.meta new file mode 100644 index 0000000..13a24e1 --- /dev/null +++ b/Assets/Resources/OVRPlatformToolSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: efbb484c17a0c1444ab4097461fd696f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 053858e..1caa29b 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -122,7 +122,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.6.1 + bundleVersion: 0.6.2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 9bebbca..15bf7b1 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.4.18f1 +m_EditorVersion: 2018.4.22f1