Commit Graph

13 Commits

Author SHA1 Message Date
fbd34cb9dc Update to 3.17 Unity version
Updated to 3.17 and opened project
2024-01-18 14:33:32 -05:00
d1b85234a7 Merge branch 'development' into test/input-test
All seems to be running correctly. Took my side of the changes for the two conflicts. Had to re add lfs files
2024-01-11 09:45:52 -05:00
Cody Wright
b4656bf24a Fixed watch texture
added the missing watch texture and corrected the watch orientation
2024-01-09 15:38:27 -05:00
0df17c71f0 Revert "Merge remote-tracking branch 'origin/development' into test/input-test"
This reverts commit Package issues 
c81cd6d2af, reversing
changes made to 426c11863a.
2024-01-05 15:25:48 -05:00
c81cd6d2af Merge remote-tracking branch 'origin/development' into test/input-test
Merging input and development
2024-01-05 14:55:09 -05:00
Brown, Caleb M
7bfb0cd6ea Added XR Input Test scene 2023-12-14 14:29:27 -05:00
Cody Wright
45bb69ff56 Add Gravity to Removed Parts
Added gravity to the clip, CanisterTape, plug, and Flip_Pad_Pull_Out (Rigidbody)
2023-12-13 17:09:22 -05:00
6d12cb95f3 Meta quest hands free
- Added Hands free support
- Added pinch and touch and wheel support
- ALL but movement and teleporting works , still some small bugs other than that
2023-12-13 11:47:31 -05:00
345ac8d576 Added meta quest movement
- Added metaquest movement with L/R
- Retargeted to android
2023-11-29 08:49:07 -05:00
Joshua Latham
a99f7bccad Added prefabe with hands for player 2023-11-06 10:22:50 -05:00
Joshua Latham
f71f90aac0 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
Joshua Latham
5bc27d80e7 Added Unity XR Hands package 2023-11-03 08:51:51 -04:00
Joshua Latham
1dea5a0c4c Adding XR project and BasicScene for Stratasys development 2023-10-30 08:42:18 -04:00