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

Commit Graph

  • 897f91d803 Adding new demo scene with controllers and hands working Demo_Test Kipplesnbits 2025-01-17 10:56:53 -0500
  • b9e2b0a3c6 Revert "Adding new demo scene with controllers and hands working" development Kipplesnbits 2025-01-17 10:57:15 -0500
  • 5a536c3a80 Adding new demo scene with controllers and hands working Kipplesnbits 2025-01-17 10:56:53 -0500
  • 686d9e0614 Merge pull request 'feature/2196-poke-haptics-update' (#39) from feature/2196-poke-haptics-update into development Joshua Latham 2024-02-16 18:27:12 +0000
  • b14ba06c1d Merge branch 'development' into feature/2196-poke-haptics-update Joshua Latham 2024-02-16 18:05:44 +0000
  • ea74e4eea4 Merge pull request 'feature/add-outline-to-object-on-hover' (#38) from feature/add-outline-to-object-on-hover into development Joshua Latham 2024-02-16 16:07:12 +0000
  • b16cf9d058 Merge branch 'feature/add-outline-to-object-on-hover' of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR into feature/2196-poke-haptics-update Cody Wright 2024-02-16 09:31:40 -0500
  • 71a94ffd2e Updated the Hover Outline script Cody Wright 2024-02-15 17:19:33 -0500
  • 11b7a0b893 Updated the script and changed how the outline color is set Cody Wright 2024-02-15 16:16:04 -0500
  • 40b3a47879 Removed outline from Flip_Pad_Pull_Out Cody Wright 2024-02-15 11:54:26 -0500
  • 0cecb6eb82 Merge branch 'feature/add-outline-to-object-on-hover' of https://udrimavric.com/MAVRIC/Stratasys-450mc-VR into feature/2196-poke-haptics-update Cody Wright 2024-02-13 10:41:07 -0500
  • 22018f9c4c Decreased button travel distance Cody Wright 2024-02-13 10:04:36 -0500
  • 40dfa1f735 Added highlight to the flip pad rigidbody Cody Wright 2024-02-09 17:23:50 -0500
  • d5f6d15c8a Added Highlight on hover to removeable objects Cody Wright 2024-02-09 15:36:34 -0500
  • 30114a97e7 Merge pull request 'feature/2188-Cannister-update' (#37) from feature/2188-Cannister-update into development bugfix/Cannister-Affordance Joshua Latham 2024-02-07 17:44:49 +0000
  • 6ce5777e65 Merge branch 'development' into feature/2188-Cannister-update Joshua Latham 2024-02-07 17:03:23 +0000
  • e890e8b61b Merge pull request 'bugfix/Fit-It-All-Walkup' (#36) from bugfix/Fit-It-All-Walkup into development Joshua Latham 2024-02-07 17:01:34 +0000
  • e3c0feadb7 Checked overrides, runs well! Kip Taylor 2024-02-07 10:30:24 -0500
  • 5d2284c395 moved objects and swapped containers Kip Taylor 2024-02-07 10:23:41 -0500
  • 23eaf13cb5 Added Mavric Affordance Kip Taylor 2024-02-07 09:34:35 -0500
  • 672c907fa7 Merge branch 'development' into bugfix/Fit-It-All-Walkup Kip Taylor 2024-02-06 12:27:28 -0500
  • a6a0eb2e79 Merge pull request 'feature/2248-switch-watch-hand' (#35) from feature/2248-switch-watch-hand into development Caleb Brown 2024-02-05 19:56:45 +0000
  • 45aca88bb2 Made changes based on feedback Cody Wright 2024-02-02 14:42:49 -0500
  • 2e28950d97 Fixed watch left wrist orientation Cody Wright 2024-02-01 15:51:35 -0500
  • 4d62d0d333 Merge branch 'bugfix/merge03' into bugfix/Fit-It-All-Walkup Kip Taylor 2024-02-01 12:31:08 -0500
  • f227150895 Merge branch 'bugfix/merge02' into bugfix/Fit-It-All-Walkup Kip Taylor 2024-02-01 12:11:08 -0500
  • b8017b66b6 Merge branch 'bugfix/merge01' into bugfix/Fit-It-All-Walkup Kip Taylor 2024-02-01 12:05:49 -0500
  • 3155fb7f67 Merge remote-tracking branch 'origin/test/yaml-merge' into bugfix/Kip-Fix-It-All Kip Taylor 2024-02-01 12:02:16 -0500
  • 3f5c7ab5e9 WIP: Added Watch Swapping Cody Wright 2024-01-30 17:44:46 -0500
  • 53e24cbdb8 Merge pull request 'Fixed flip arm interaction' (#34) from bugfix/2251-Fix-flip-arm-pad-interactive into development bugfix/Readjust_Lab_Space Joshua Latham 2024-01-29 22:33:38 +0000
  • e5f95fbbdb Merge branch 'development' into bugfix/2251-Fix-flip-arm-pad-interactive Joshua Latham 2024-01-29 17:30:51 -0500
  • fc3463ff68 Merge pull request 'Walls , objects, and teleportation' (#33) from 2256-Teleport-cleanup into development Joshua Latham 2024-01-29 22:22:05 +0000
  • 843f229c5f Fixed flip arm interaction Cody Wright 2024-01-29 11:52:00 -0500
  • 6a49066418 Merge branch 'development' into 2256-Teleport-cleanup Kip Taylor 2024-01-26 10:32:24 -0500
  • bb883faecc Merge pull request 'feature/2177-Update-Lighting' (#30) from feature/2177-Update-Lighting into development Joshua Latham 2024-01-26 14:21:43 +0000
  • 11487bde36 Updated height and overrides Kip Taylor 2024-01-25 15:24:17 -0500
  • 69d829b733 Added final colldier check Kip Taylor 2024-01-25 11:40:46 -0500
  • dcb7243df6 Walls , objects, and teleportation Kip Taylor 2024-01-25 11:23:59 -0500
  • 57acd53a68 Merge branch 'development' into feature/2177-Update-Lighting Cody Wright 2024-01-25 09:20:31 -0500
  • f1c86606bd Merge pull request 'bugfix/2204-Fix-Teleportation-On-Vive' (#32) from bugfix/2204-Fix-Teleportation-On-Vive into development Joshua Latham 2024-01-24 19:08:08 +0000
  • 97bc98470b Merge branch 'development' into feature/2177-Update-Lighting Cody Wright 2024-01-24 11:52:18 -0500
  • 63271ac1b4 Merge branch 'development' into bugfix/2204-Fix-Teleportation-On-Vive kip 2024-01-24 11:21:44 -0500
  • fdb8699737 Hand tracking kip 2024-01-24 10:53:28 -0500
  • f8e93bec59 Fixed ray showing up kip 2024-01-23 16:52:27 -0500
  • d94fef0e9f Merge pull request 'Update to 3.17 Unity version and merge to development' (#31) from Featur/Update-to-3.17 into development Joshua Latham 2024-01-22 13:55:17 +0000
  • aefb1c6e2c Fixed teleportation bug kip 2024-01-22 08:12:55 -0500
  • fbd34cb9dc Update to 3.17 Unity version Ktaylor 2024-01-18 14:33:32 -0500
  • 7622b0fa8d Updating to 3.17 update Ktaylor 2024-01-18 14:27:13 -0500
  • e81157c4e2 updated baked light map of light probs Cody Wright 2024-01-18 11:01:41 -0500
  • bf6349ad24 WIP: Adding dynamic lights Cody Wright 2024-01-16 15:18:22 -0500
  • e6dd99f93d Merge pull request 'test/input-test' (#29) from test/input-test into development Joshua Latham 2024-01-12 21:37:23 +0000
  • dd089d2b22 Merge Conflicts & Override Changes kiptaylor 2024-01-12 14:23:01 -0500
  • ef61aae2ea Gravity fix kiptaylor 2024-01-11 10:29:50 -0500
  • d1b85234a7 Merge branch 'development' into test/input-test kiptaylor 2024-01-11 09:45:52 -0500
  • c4c28c542d Merge pull request 'feature/2195-Add-Wrist-Watch-To-XR-Toolkit' (#28) from feature/2195-Add-Wrist-Watch-To-XR-Toolkit into development Joshua Latham 2024-01-10 20:11:42 +0000
  • 04fb790995 Merge branch 'development' into feature/2195-Add-Wrist-Watch-To-XR-Toolkit Joshua Latham 2024-01-10 19:53:25 +0000
  • b4656bf24a Fixed watch texture Cody Wright 2024-01-09 15:38:27 -0500
  • 2000dd89b7 Watch in position Cody Wright 2024-01-09 13:21:26 -0500
  • 89b136ffab MAVRIC-2185: Fixed FlipArm door socket issue Brown, Caleb M 2023-12-21 14:23:51 -0500
  • 87d73beaa9 Teleportation area fix kiptaylor 2024-01-08 20:11:21 -0500
  • 1ade2108d7 Updated watch model Cody Wright 2024-01-08 15:01:39 -0500
  • 2316a316a0 Revert "Add Watch To Wrist" Cody Wright 2024-01-05 16:51:53 -0500
  • bb85b2ab81 Checking kiptaylor 2024-01-05 16:00:12 -0500
  • 147e39d66b Meta Quest kiptaylor 2024-01-05 15:45:13 -0500
  • 0d8a184787 Revert "Merge remote-tracking branch 'origin/development' into Kips-DevField" kiptaylor 2024-01-05 15:33:07 -0500
  • 0df17c71f0 Revert "Merge remote-tracking branch 'origin/development' into test/input-test" kiptaylor 2024-01-05 15:25:20 -0500
  • 9534ee2407 Merge remote-tracking branch 'origin/development' into Kips-DevField kiptaylor 2024-01-05 14:55:46 -0500
  • c81cd6d2af Merge remote-tracking branch 'origin/development' into test/input-test kiptaylor 2024-01-05 14:55:09 -0500
  • 426c11863a Version swap to planned version kiptaylor 2024-01-05 12:51:29 -0500
  • 32ce2521b9 First time setup stuff to swap to .11 version of unity kiptaylor 2024-01-05 12:49:18 -0500
  • 7cbfb62cf4 Add Watch To Wrist Cody Wright 2024-01-05 12:43:58 -0500
  • 68c32226ae Revert "FIxed sdk bug maybe" kiptaylor 2024-01-04 16:17:32 -0500
  • 11c7f59c9e Merge pull request 'Add Gravity to Removed Parts' (#25) from feature/2185-Add-gravity-to-removed-parts into development Joshua Latham 2023-12-21 20:03:38 +0000
  • 453206a0f7 MAVRIC-2185: Fixed FlipArm door socket issue Brown, Caleb M 2023-12-21 14:23:51 -0500
  • 2b38f54c89 FIxed sdk bug maybe Ktaylor 2023-12-20 13:43:28 -0500
  • 34557c7b13 Applied changed to the Cartridge_V3 Variant Interactable.prefab Cody Wright 2023-12-15 16:11:42 -0500
  • 9779f35d48 Merge pull request 'bugfix/MAVRIC-2185_Fix-Interactable-Locking-Filter' (#27) from bugfix/MAVRIC-2185_Fix-Interactable-Locking-Filter into feature/2185-Add-gravity-to-removed-parts Caleb Brown 2023-12-15 20:38:21 +0000
  • ea3eaa6e03 BUGFIX: Fixed Rigidbody Pad to be socketed on Active Brown, Caleb M 2023-12-15 12:31:30 -0500
  • 0882c6e866 BUGFIX: Fix for the InteractableLockingFilter blocking everything (including physics??) driven via the GrabInteractable when "locked" Brown, Caleb M 2023-12-15 12:13:25 -0500
  • 49c64eeb2f Fixed Scenes Ktaylor 2023-12-14 15:16:14 -0500
  • bddafeb271 Added locomotion input testing Ktaylor 2023-12-14 15:07:14 -0500
  • 4fdfd60617 Added vscode ignore Ktaylor 2023-12-14 15:06:28 -0500
  • cb3ee58c51 quick fix for vs Ktaylor 2023-12-14 14:31:57 -0500
  • 7bfb0cd6ea Added XR Input Test scene Brown, Caleb M 2023-12-14 14:29:27 -0500
  • 7414d78178 Removed Meta sdk Brown, Caleb M 2023-12-14 14:28:48 -0500
  • 6bd191ee6b Removed ignored files/folders Brown, Caleb M 2023-12-14 14:28:20 -0500
  • 52c0391d44 Added build folder Ktaylor 2023-12-14 09:58:40 -0500
  • 45bb69ff56 Add Gravity to Removed Parts Cody Wright 2023-12-13 17:09:22 -0500
  • 6d12cb95f3 Meta quest hands free Ktaylor 2023-12-13 11:47:31 -0500
  • 12f35684f3 Added Locomotion and tele area Ktaylor 2023-12-04 07:32:17 -0500
  • 20f73c682d Added some tracking and performance Ktaylor 2023-11-30 08:00:17 -0500
  • 345ac8d576 Added meta quest movement Ktaylor 2023-11-29 08:49:07 -0500
  • ae0e8ce49a Merge pull request 'Bugfix: Thumbwheel Scrolling' (#24) from bugfix/Thumbwheel-Scroll into development Joshua Latham 2023-11-15 21:08:25 +0000
  • 84128228f9 Merge branch 'development' into bugfix/Thumbwheel-Scroll Joshua Latham 2023-11-15 19:41:00 +0000
  • c17ec76197 Merge pull request 'Fixes for hand ray interactors' (#23) from feature/MAVRIC-2181-hands into development Joshua Latham 2023-11-15 18:21:58 +0000
  • 18b2466551 changed xrscroll to inherit baseinteractable Abraham Blain 2023-11-14 14:53:07 -0500
  • 21bffe68b7 re-enabled flip arm Abraham Blain 2023-11-14 14:27:15 -0500
  • 1ed1b0b311 removed debug cubes, and refactored xrscroll event Abraham Blain 2023-11-14 13:46:05 -0500
  • 1542176845 Simplified rotate and scale target classes, added to thumbwheel Abraham Blain 2023-11-14 13:38:38 -0500
  • cd5af28a09 created xr scroll component Abraham Blain 2023-11-14 11:51:12 -0500