UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-27 09:44:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
Stratasys-450mc-VR/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta

13 lines
433 B
Plaintext
Raw Normal View History

Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
fileFormatVersion: 2
Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands # Conflicts: # Assets/Samples/XR Hands.meta # Assets/Samples/XR Interaction Toolkit/2.4.3.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Tunneling Vignette/TunnelingVignette.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta # Packages/manifest.json # Packages/packages-lock.json
2023-11-03 23:38:31 -04:00
<<<<<<<< HEAD:Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta
Re-updating XR package versions
2023-11-03 20:39:33 -04:00
guid: c3eeea6fc179a8a438d79f05ce0ba151
Merge branch 'feature/MAVRIC-2127_Thumbwheel' into feature/unity-xr-hands # Conflicts: # Assets/Samples/XR Hands.meta # Assets/Samples/XR Interaction Toolkit/2.4.3.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Prefabs/UI_3D.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Starter Assets/Scripts/PokeStation.meta # Assets/Samples/XR Interaction Toolkit/2.4.3/Tunneling Vignette/TunnelingVignette.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/Prefabs/XR Interaction Hands Setup.prefab # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoScene.unity # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta # Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta # Packages/manifest.json # Packages/packages-lock.json
2023-11-03 23:38:31 -04:00
========
guid: 90a5974969e85834f8306496fd3cda4c
>>>>>>>> feature/MAVRIC-2127_Thumbwheel:Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/DemoSceneAssets/Models.meta
Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Reference in New Issue Copy Permalink