UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-22 15:18:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'feature/2196-poke-haptics-update' (#39) from feature/2196-poke-haptics-update into development

Browse Source 
Reviewed-on: https://udrimavric.com/MAVRIC/Stratasys-450mc-VR/pulls/39
This commit is contained in:
Joshua Latham 2024-02-16 18:27:12 +00:00
commit 686d9e0614
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Environment/Prefabs/Tutorial Objects.prefab
View File

@ -193,6 +193,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 1.608
objectReference: {fileID: 0}
- target: {fileID: 6882247216532109876, guid: e09ae04bf969e472ba45f969a4e4e835, type: 3}
propertyPath: m_MaxDistance
value: 5
objectReference: {fileID: 0}
- target: {fileID: 7121317035476629590, guid: e09ae04bf969e472ba45f969a4e4e835, type: 3}
propertyPath: m_Name
value: BackBoard

4
Assets/Prefabs/UI/NextButton.prefab
View File

@ -296,10 +296,6 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 316718569413247376}
m_Modifications:
- target: {fileID: 438796940644668670, guid: e5db301629853dd4a99835fa70099d79, type: 3}
propertyPath: m_MaxDistance
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2482363001952073328, guid: e5db301629853dd4a99835fa70099d79, type: 3}
propertyPath: m_LocalPosition.z
value: -5

6
Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Prefabs/UI/TextButton.prefab
View File

@ -34,7 +34,6 @@ RectTransform:
- {fileID: 3744793336206911786}
- {fileID: 2849559158440995629}
m_Father: {fileID: 5289182684458692541}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@ -123,7 +122,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2482363001952073328}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -207,7 +205,6 @@ RectTransform:
m_Children:
- {fileID: 2482363001952073328}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -333,7 +330,7 @@ MonoBehaviour:
m_ReturnToInitialPosition: 1
m_ApplyIfChildIsTarget: 1
m_ClampToMaxDistance: 1
m_MaxDistance: 20
m_MaxDistance: 0.25
--- !u!1 &7228554695504750986
GameObject:
m_ObjectHideFlags: 0
@ -365,7 +362,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2482363001952073328}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}