diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset index f9da5fd9..d0748b5d 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -12,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityBoundaryVisualizationProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} boundaryHeight: 3 showFloor: 1 floorMaterial: {fileID: 2100000, guid: cff739f75e6f4d2aa27638b66200ef95, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityCameraProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityCameraProfile.asset index a9fbb370..79c2808f 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityCameraProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityCameraProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityCameraProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} isCameraPersistent: 1 nearClipPlaneOpaqueDisplay: 0.1 cameraClearFlagsOpaqueDisplay: 1 @@ -21,4 +22,4 @@ MonoBehaviour: nearClipPlaneTransparentDisplay: 0.1 cameraClearFlagsTransparentDisplay: 2 backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0} - holoLensQualityLevel: 0 + transparentQualityLevel: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset index 772ab716..a28b427b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityDiagnosticsProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} visible: 0 showCpu: 1 handlerType: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset index 3b62d305..80091b7e 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset @@ -13,4 +13,5 @@ MonoBehaviour: m_Name: DefaultMixedRealityRegisteredServiceProvidersProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} configurations: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset index 2b62c7e4..85fd6b89 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultGenericOpenVRControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Generic OpenVR Controller Left diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset index 923670b9..e554fb25 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultGenericUnityControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Generic Unity Controller diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset index 65ed63af..f452bd72 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultLuminControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Lumin Motion Controller Left diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset index f492e543..724b9531 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMouseControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Mouse Input diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset index 077109f0..567932fd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultOculusRemoteControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Oculus Remote Controller diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset index 1a1d3e4f..8e58bf88 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultOculusTouchControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Oculus Touch Controller Left diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset index aecf300c..ba3396aa 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultTouchScreenControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Touch Screen Input diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset index 70415795..1c8c0b28 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultViveWandControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Vive Wand Controller Left diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset index 22fed63d..5b68c35b 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultWindowsMixedRealityControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Windows Mixed Reality HoloLens Hand Input diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset index eef8eedb..4e121bd2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultXboxControllerMappingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} hasSetupDefaults: 1 controllerMappings: - description: Xbox Controller diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset index df68d8d6..307304cc 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityControllerDataProvidersProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} registeredControllerDataProviders: - dataProviderType: reference: XRTK.Providers.Controllers.UnityInput.MouseDataProvider, XRTK diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset index 66c316ef..8a3b0eb5 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityControllerMappingProfiles m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} controllerMappingProfiles: - {fileID: 11400000, guid: a3d986e05a0242d9b4b4d1be1543149b, type: 2} - {fileID: 11400000, guid: 037f788d893441f289c4f87185f262cb, type: 2} diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset index 73e9735f..d843cb16 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityControllerVisualizationProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} renderMotionControllers: 1 controllerVisualizationType: reference: XRTK.SDK.UX.Controllers.DefaultMixedRealityControllerVisualizer, XRTK.SDK diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset index 35ddbaae..0aff3abc 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset @@ -13,11 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityGesturesProfile m_EditorClassIdentifier: isCustomProfile: 0 - manipulationGestures: 15 - navigationGestures: 112 - useRailsNavigation: 0 - railsNavigationGestures: 896 - windowsGestureAutoStart: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} gestures: - description: Hold gestureType: 3 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset index e82b61bf..b57a0175 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -12,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityInputActionRulesProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} inputActionRulesDigital: [] inputActionRulesSingleAxis: [] inputActionRulesDualAxis: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset index 1eb9c0ed..667ab597 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityInputActionsProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} inputActions: - id: 1 description: Select diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset index 9b1a6e57..6aa5c572 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityInputPointerProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} pointingExtent: 10 pointingRaycastLayerMasks: - serializedVersion: 2 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset index ed56eac9..662cdb69 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealityInputSystemProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} focusProviderType: reference: XRTK.Services.InputSystem.FocusProvider, XRTK inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset index 1be584d6..edcda6d7 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -12,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealitySpeechCommandsProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} startBehavior: 0 recognitionConfidenceLevel: 1 speechCommands: diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset index bcdefbf5..2569d605 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset @@ -4,7 +4,8 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -12,4 +13,5 @@ MonoBehaviour: m_Name: DefaultMixedRealityNetworkingProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} registeredNetworkDataProviders: [] diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset index 7b140284..91510dc2 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultMixedRealitySpatialAwarenessSystemProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} registeredSpatialObserverDataProviders: - spatialObserverType: reference: XRTK.WindowsMixedReality.SpatialObservers.WindowsMixedRealitySpatialMeshObserver, diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset index fc0f489c..dbeb1bbd 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset +++ b/XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: DefaultWindowsMixedRealitySpatialMeshObserverProfile m_EditorClassIdentifier: isCustomProfile: 0 + parentProfile: {fileID: 11400000, guid: 41ce31a4954544c58d16f6b3c4c88f4b, type: 2} startupBehavior: 0 observationExtents: {x: 3, y: 3, z: 3} isStationaryObserver: 0 diff --git a/XRTK.SDK/Packages/com.xrtk.sdk/package.json b/XRTK.SDK/Packages/com.xrtk.sdk/package.json index 68bdd36f..7a3278f3 100644 --- a/XRTK.SDK/Packages/com.xrtk.sdk/package.json +++ b/XRTK.SDK/Packages/com.xrtk.sdk/package.json @@ -2,7 +2,7 @@ "name": "com.xrtk.sdk", "displayName": "XRTK.SDK", "description": "The SDK for the Mixed Reality Toolkit", - "version": "0.1.6", + "version": "0.1.7", "unity": "2019.1", "license": "MIT", "repository": { @@ -12,6 +12,6 @@ "src": "Assets/XRTK.Core", "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { - "com.xrtk.core": "0.1.9" + "com.xrtk.core": "0.1.10" } } \ No newline at end of file diff --git a/XRTK.SDK/Packages/manifest.json b/XRTK.SDK/Packages/manifest.json index f2e77d02..ce804993 100644 --- a/XRTK.SDK/Packages/manifest.json +++ b/XRTK.SDK/Packages/manifest.json @@ -5,10 +5,10 @@ "com.unity.textmeshpro": "2.0.0", "com.unity.xr.legacyinputhelpers": "2.0.2", "com.unity.xr.oculus.standalone": "1.29.1", - "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.9", - "com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.1", + "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.10", + "com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.2", "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.5", - "com.xrtk.wmr": "https://github.com/XRTK/WindowsMixedReality.git#0.1.2", + "com.xrtk.wmr": "https://github.com/XRTK/WindowsMixedReality.git#0.1.3", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", @@ -42,20 +42,20 @@ }, "lock": { "com.xrtk.core": { - "hash": "d4be87365d4a56d22bb908f3acc8b409cf10240c", - "revision": "0.1.9" + "hash": "69f4126007422a60fc0e26b8ccf846e0f7118574", + "revision": "0.1.10" }, "com.xrtk.lumin": { - "hash": "45da20dee3740ee5781aa380c962f1aa361c7a7c", - "revision": "0.1.1" + "hash": "a196ab9a5e951eb79905a732dfbbd2a08becd78a", + "revision": "0.1.2" }, "com.xrtk.upm-git-extension": { "hash": "4e5c893cdbb28c82f8d23756696515108fe130ef", "revision": "0.9.5" }, "com.xrtk.wmr": { - "hash": "7b8d08a2318b9c5190608741debfb2d7078bdae7", - "revision": "0.1.2" + "hash": "40f707ba94f5b34d8969246ee980dbe9c3b8ff31", + "revision": "0.1.3" } } } diff --git a/XRTK.SDK/ProjectSettings/ProjectVersion.txt b/XRTK.SDK/ProjectSettings/ProjectVersion.txt index 241ebd0e..328efc8c 100644 --- a/XRTK.SDK/ProjectSettings/ProjectVersion.txt +++ b/XRTK.SDK/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.1.0f2 -m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c) +m_EditorVersion: 2019.1.1f1 +m_EditorVersionWithRevision: 2019.1.1f1 (fef62e97e63b)