UDRI-XRT/Stratasys-450mc-VR
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR.git synced 2025-01-22 07:09:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
62 Commits 7 Branches 1 Tag 766 MiB
cea07721b6
Commit Graph

62 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calderon, Noah
cea07721b6 Merge branch 'feature/unity-xr-hands' into feature/MAVRIC-2174_Update_Info_Board 2023-11-06 22:30:16 -05:00
Joshua Latham
6cdf735212 Updates to the XR Rig to get locomotion working 2023-11-06 13:27:47 -05:00
Joshua Latham
0aa1361a04 Updated imported sample with new MAVRIX XR rig prefab 2023-11-06 12:40:10 -05:00
Joshua Latham
190506bc46 Created MAVRIC XR Hands Origing rig prefab 2023-11-06 12:02:30 -05:00
Joshua Latham
521fee9da3 Added XRI Examples scene for testing hands implementation 2023-11-06 11:42:08 -05:00
Joshua Latham
cfd3ac4705 Re-imported hands samples. Updated standard materials to URP versions. 2023-11-06 10:29:26 -05:00
Joshua Latham
a99f7bccad Added prefabe with hands for player 2023-11-06 10:22:50 -05:00
Noah
d443195b6e MAVRIC-2174 added logo animation 2023-11-06 07:46:34 -05:00
Joshua Latham
d7c13a014a Updated lighting 2023-11-06 07:20:30 -05:00
Noah
a0c4252d4d MAVRIC-2174 fixed labels not disappearing 2023-11-05 22:18:06 -05:00
Noah
cfbbc7f1c7 Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board 2023-11-05 22:06:15 -05:00
Noah
b1fb92807f MAVRIC-2174 save point 2023-11-05 22:05:29 -05:00
Joshua Latham
15f5725e8e Merge branch 'development' into feature/unity-xr-hands 2023-11-03 23:40:04 -04: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
a6a393064d Converted to names in asmdef instead of GUIDs 2023-11-03 20:49:42 -04:00
Joshua Latham
b3b8bb5c08 Re-updating XR package versions 2023-11-03 20:39:33 -04:00
Joshua Latham
ee9b2484ad Update to XR Toolkit 2.5.2 2023-11-03 20:23:48 -04:00
Joshua Latham
c7fba191eb Merge pull request 'MAVRIC-2127: Thumbwheel Interaction' (#7) from feature/MAVRIC-2127_Thumbwheel into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/7
 2023-11-03 21:23:56 +00:00
Joshua Latham
97364e0e5a Merge branch 'development' into feature/MAVRIC-2127_Thumbwheel 2023-11-03 21:20:05 +00:00
Joshua Latham
c6ac6d2c4f Merge pull request 'Canister Explosion Animation' (#5) from feature/Explosion-Animation into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/5
 2023-11-03 20:43:35 +00:00
Noah
6b131539d8 MAVRIC-2174 save point 2023-11-03 16:03:13 -04:00
Brown, Caleb M
f54e7df134 MAVRIC-2127: Updated the scale direction of the filament 2023-11-03 15:58:14 -04:00
Abraham Blain
b0fa3f5638 callout fix 2023-11-03 15:49:09 -04:00
Abraham Blain
8533206650 another callout position update 2023-11-03 15:37:29 -04:00
Abraham Blain
d7b888e528 adjusted callout offset 2023-11-03 15:20:50 -04:00
Abraham Blain
619762e2b3 swapped labels and added explosion events 2023-11-03 15:16:36 -04:00
Joshua Latham
9e1b249f4a Updated room model and lighting 2023-11-03 14:14:26 -04:00
Brown, Caleb M
5268622fc7 MAVRIC-2127: Added a capsule that scales in the direction ot the thumbwheel 2023-11-03 13:38:36 -04:00
Abraham Blain
79ef80303b turned on plug during animation 2023-11-03 12:59:08 -04:00
Abraham Blain
6e0f26ed77 Merge remote-tracking branch 'origin/development' into feature/Explosion-Animation 2023-11-03 12:53:26 -04:00
Brown, Caleb M
20197e29a1 Merge remote-tracking branch 'origin/development' into feature/MAVRIC-2127_Thumbwheel 2023-11-03 12:42:32 -04:00
Brown, Caleb M
9e8291b686 MAVIRC-2127: Moved a component 2023-11-03 12:41:55 -04:00
Brown, Caleb M
00b21f27c8 MAVIRC-2127: Updated XRI Toolkit 2023-11-03 12:39:31 -04:00
Brown, Caleb M
131ce9532c MAVRIC-2127: Updated imported package samples 2023-11-03 12:39:09 -04:00
Brown, Caleb M
eebda1a48a MAVRIC-2127: Fixed missing scripts 2023-11-03 12:38:48 -04:00
Brown, Caleb M
20b62c47bb MAVRIC-2127: Added Slide interaction to the Thumbwheel 2023-11-03 12:34:22 -04:00
Joshua Latham
4a1f9ef79f Added Fortus room model 2023-11-03 11:49:12 -04:00
Joshua Latham
fed10585d3 Merge pull request 'MAVRIC Update tape and can with new materials and fix plug animation' (#6) from feature/Update_Tape_And_Canister_material into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/6
 2023-11-03 15:45:14 +00:00
Joshua Latham
b760ee9526 Material updates 2023-11-03 11:11:02 -04:00
Joshua Latham
1f2b5d7afc Fixed non URP materials 2023-11-03 10:37:00 -04:00
Abraham Blain
c2c71370ec added part explosion step to procedure 2023-11-03 09:21:55 -04:00
Joshua Latham
5bc27d80e7 Added Unity XR Hands package 2023-11-03 08:51:51 -04:00
Noah
009821e39c MAVRIC Update tape and can with new materials and fix plug animation 2023-11-03 08:22:01 -04:00
Abraham Blain
b5aaa80171 added namespaces and part label manager to guide model 2023-11-02 22:21:25 -04:00
Abraham Blain
fa394a034a added explosion animations and part label scripts 2023-11-02 22:14:02 -04:00
Abraham Blain
48e506beb4 Merge remote-tracking branch 'origin/development' into feature/Explosion-Animation 2023-11-02 15:26:43 -04:00
Joshua Latham
26fffb48ee Merge pull request 'feature/MAVRIC-2110_Import_Stratsys_AR_Content' (#3) from feature/MAVRIC-2110_Import_Stratsys_AR_Content into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/3
 2023-11-02 19:04:30 +00:00
Abraham Blain
3f933bf1ce Merge remote-tracking branch 'origin/development' into feature/Explosion-Animation 2023-11-02 14:53:05 -04:00
Joshua Latham
3e34a3e128 Merge pull request 'bugfix/Odin-Inspector' (#4) from bugfix/Odin-Inspector into development 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/4
 2023-11-02 18:22:25 +00:00
Noah
df9299e014 MAVRIC-2110 Update animation with loop and tracking in clips 2023-11-02 13:17:28 -04:00