UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-26 01:08:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
Stratasys-450mc-VR/Assets/Samples/XR Interaction Toolkit/2.5.2/Hands Interaction Demo/HandsDemoSceneAssets/Materials/AccentButton.mat.meta

13 lines
509 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/HandsDemoSceneAssets/Materials/AccentButton.mat.meta
Added Unity XR Hands package
2023-11-03 08:51:51 -04:00
guid: 53c16fb5d5c516b40a1f6a8fc34132f3
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: 0a35b7e20f75a8540a2c14b9555078cb
>>>>>>>> feature/MAVRIC-2127_Thumbwheel:Assets/Samples/XR Interaction Toolkit/2.5.2/Starter Assets/Tunneling Vignette/TunnelingVignette.mat.meta
Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
NativeFormatImporter:
externalObjects: {}
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
mainObjectFileID: 0
Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
userData:
assetBundleName:
assetBundleVariant:
Reference in New Issue Copy Permalink