UDRI-XRT/Stratasys-Fortus-450mc
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-Fortus-450mc.git synced 2025-01-22 07:09:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 1887d5df56 Merge pull request 'MAVRIC-2222 updated document script to accept standard and URP rendering' (#21) from bugfix/MAVRIC-2222_Fix_Documents_Not_Changing into development development Joshua Latham 2023-12-04 13:57:16 +0000
  • c9ccc07b15 MAVRIC-2222 updated document script to accept standard and URP rendering bugfix/MAVRIC-2222_Fix_Documents_Not_Changing Noah 2023-11-30 08:43:45 -0500
  • 85d949677c Merge pull request 'bugfix/MAVRIC-2186_Tablet_Updates' (#20) from bugfix/MAVRIC-2186_Tablet_Updates into development Joshua Latham 2023-11-16 21:05:30 +0000
  • 98ccdb77aa MAVRIC-2186 update to urp Noah 2023-11-16 12:36:14 -0500
  • 281097553e MAVRIC-2186 update demo scene Noah 2023-11-16 10:06:42 -0500
  • 978d13c961 MAVRIC-2186 clean up Noah 2023-11-16 09:41:19 -0500
  • f527138c68 MAVRIC-2186 added shaders Noah 2023-11-16 09:40:43 -0500
  • fdcddc7f79 Merge pull request 'Removed MRTK packages' (#18) from bugfix/MRTK-Removal into development Joshua Latham 2023-10-30 20:01:13 +0000
  • 318cb54ace Merge branch 'development' into bugfix/MRTK-Removal Brown, Caleb M 2023-10-30 15:35:00 -0400
  • 83886f9b23 Merge pull request 'bugfix/FixMinorBugs' (#17) from bugfix/FixMinorBugs into development Joshua Latham 2023-10-30 18:41:32 +0000
  • 4dee95e110 MAVRIC-2127: Updated guesture calculation based on Unity' XRI AR touch gestures bugfix/MAVRIC-2127_Guestures Brown, Caleb M 2023-10-30 10:03:26 -0400
  • 773624e488 Removed MRTK packages Brown, Caleb M 2023-10-30 07:48:16 -0400
  • 77c4005c4f MAVRIC-fixbugs added follow to Cartridge Noah 2023-10-27 16:26:08 -0400
  • 3ebe0df43c MAVRIC bug fixs changed material Noah 2023-10-27 12:44:08 -0400
  • a508bb9fb5 MAVRIC-MinorBugs fix AR list, deselect list, and unused script Noah 2023-10-27 11:51:27 -0400
  • 319ab2a11c Merge pull request 'integration/stratasys-tablet-updates' (#16) from integration/stratasys-tablet-updates into development HandOff-10-27-2023 Joshua Latham 2023-10-26 18:53:23 +0000
  • 20cf07ce20 Merge pull request 'feature/MAVRIC-2113_Improve_Animations' (#15) from feature/MAVRIC-2113_Improve_Animations into integration/stratasys-tablet-updates Joshua Latham 2023-10-26 18:48:35 +0000
  • 6201dce922 MAVRIC-2113 removed logging Noah 2023-10-26 14:41:20 -0400
  • 1b1435b538 Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2113_Improve_Animations Noah 2023-10-26 14:36:53 -0400
  • 40e301f9ae Merge pull request 'MAVRIC-2117_AR-Pickables-Rotation' (#11) from feature/MAVRIC-2117_AR-Pickables-Rotation into integration/stratasys-tablet-updates Joshua Latham 2023-10-26 18:32:19 +0000
  • 5c0e0af6dd MAVRIC-2117: Removed MAVRIC.Logging Brown, Caleb M 2023-10-26 14:23:12 -0400
  • 0a68b8175a MAVRIC-2117: Fixed broken references Brown, Caleb M 2023-10-26 14:21:14 -0400
  • 14ec025db1 Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2117_AR-Pickables-Rotation Brown, Caleb M 2023-10-26 14:20:46 -0400
  • 54f4ea685a MAVRIC-2113 turn off tape Noah 2023-10-26 14:20:33 -0400
  • c4de499f21 Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2113_Improve_Animations Noah 2023-10-26 14:14:12 -0400
  • 5527f7e22d MAVRIC-2113 update tape Noah 2023-10-26 14:13:45 -0400
  • 2d86a43531 MAVRIC-2117: Disabled finger count check Brown, Caleb M 2023-10-26 14:01:11 -0400
  • 1554367455 Merge pull request 'Content Deletion' (#14) from feature/Content-Deletion into integration/stratasys-tablet-updates Joshua Latham 2023-10-26 17:47:39 +0000
  • d365f927a0 Merge remote-tracking branch 'origin/integration/stratasys-tablet-updates' into feature/Content-Deletion feature/Content-Deletion Abraham Blain 2023-10-26 13:39:51 -0400
  • ddbb141f12 Merge pull request 'feature/MAVRIC-2116_Update_Server_UI' (#13) from feature/MAVRIC-2116_Update_Server_UI into integration/stratasys-tablet-updates Joshua Latham 2023-10-26 17:38:20 +0000
  • 925ccb7260 MAVRIC-2116 update connect Noah 2023-10-26 13:29:01 -0400
  • d01a07b7eb Merge remote-tracking branch 'origin/feature/MAVRIC-2116_Update_Server_UI' into feature/Content-Deletion Abraham Blain 2023-10-26 13:22:36 -0400
  • 5a9ebc33e2 MAVRIC-2117: Added finger count check Brown, Caleb M 2023-10-26 13:15:57 -0400
  • e66720f40d MAVRIC-2117: [WIP] Added logging Brown, Caleb M 2023-10-26 13:00:22 -0400
  • 4b1b42cd32 MAVRIC-2116 fixed camera Noah 2023-10-26 12:54:04 -0400
  • 5733432f6c fixed deletion button aspect ratio Abraham Blain 2023-10-26 12:23:45 -0400
  • 58af8626a2 Fixed mode label string alignment Abraham Blain 2023-10-26 12:10:51 -0400
  • e4fe449778 Merge branch 'bugfix/VideoDrag' into feature/Content-Deletion Abraham Blain 2023-10-26 11:49:39 -0400
  • 147471c793 Added delegates to ui draggable to stop camera rotation Abraham Blain 2023-10-26 11:49:14 -0400
  • d445d61762 MAVRIC-2117: Update to use input system guestures Brown, Caleb M 2023-10-26 11:48:48 -0400
  • 8c48dc3c46 Added mode label setter Abraham Blain 2023-10-26 11:38:01 -0400
  • 9353876621 MAVRIC-2117: Reset input value at the end of the frame Brown, Caleb M 2023-10-26 10:46:56 -0400
  • b48d360bb6 Merge remote-tracking branch 'origin/feature/MAVRIC-2116_Update_Server_UI' into feature/Content-Deletion Abraham Blain 2023-10-26 10:16:05 -0400
  • 26d2b7035a MAVRIC-2116 re import qr code Noah 2023-10-26 09:54:28 -0400
  • 68095fbc23 MAVRIC-2117: Possible fix for getting the direction of the touches Brown, Caleb M 2023-10-26 08:53:23 -0400
  • f48d2fb213 MAVRIC-2117: Removed MAVRIC.Logging Brown, Caleb M 2023-10-26 08:52:57 -0400
  • 78f83237dd MAVRIC-2117: [WIP] Updated RotateZ and Scale to use the Dot product to determine if the touch input is valid Brown, Caleb M 2023-10-26 07:42:23 -0400
  • 6373af2f2c added content deletion button and deletion code Abraham Blain 2023-10-25 16:56:28 -0400
  • b60c4f2217 MAVRIC-2117: Updated components to reflection action map changes Brown, Caleb M 2023-10-25 16:42:45 -0400
  • c4c1ccc533 MAVRIC-2117: Updated (Desktop) input modifiers to be more different (in hopes that this can help thing about touchscreen inputs) Brown, Caleb M 2023-10-25 16:35:18 -0400
  • 88f2aaaaeb Merge remote-tracking branch 'origin/feature/MAVRIC-2116_Update_Server_UI' into feature/Pickable-Selection-Update Abraham Blain 2023-10-25 16:11:26 -0400
  • bbe451b731 Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2116_Update_Server_UI Noah 2023-10-25 15:18:01 -0400
  • 4b445a4ea6 MAVRIC-2116 update icons Noah 2023-10-25 14:16:40 -0400
  • a14dfc034e MAVRIC-2117: Updated XYRotation (touch) input Brown, Caleb M 2023-10-25 13:06:29 -0400
  • a36da9d41d MAVRIC-2117: Updated zRotationSpeed value Brown, Caleb M 2023-10-25 13:01:16 -0400
  • e9ece697c5 Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2117_AR-Pickables-Rotation Brown, Caleb M 2023-10-25 12:57:54 -0400
  • b3776d1345 Merge pull request 'Updated content picker selection' (#12) from feature/Pickable-Selection-Update into integration/stratasys-tablet-updates Joshua Latham 2023-10-25 15:57:54 +0000
  • d2c2b50134 Merge remote-tracking branch 'origin/integration/stratasys-tablet-updates' into feature/Pickable-Selection-Update Abraham Blain 2023-10-25 11:04:09 -0400
  • d0ec31647c Merge branch 'integration/stratasys-tablet-updates' into feature/MAVRIC-2117_AR-Pickables-Rotation Brown, Caleb M 2023-10-25 10:54:39 -0400
  • 6127ca750d Merge branch 'development' into integration/stratasys-tablet-updates Joshua Latham 2023-10-25 10:32:34 -0400
  • a673145c4b MAVRIC-2116 update aspect filter Noah 2023-10-25 09:43:10 -0400
  • 3a6ddeda4b MAVRIC-2113 added new tape Noah 2023-10-25 09:33:55 -0400
  • e60dcc9b3f MAVRIC-2117: Updated rotate component to *slightly* better camera based rotation but also updated the orientation of how the content is placed Brown, Caleb M 2023-10-25 07:47:19 -0400
  • e9d14e84ca MAVRIC-2117: Updated the scene to fix broken prefab overrides Brown, Caleb M 2023-10-24 15:59:46 -0400
  • 7deaefafef MAVRIC-2117: [WIP] Updated Scale component with touch support (untested) Brown, Caleb M 2023-10-24 15:57:43 -0400
  • b4feae9276 MAVRIC-2117: Renamed Rotatation component Brown, Caleb M 2023-10-24 15:48:10 -0400
  • 0a5494a52a MAVRIC-2116 fixed set up Noah 2023-10-24 14:52:27 -0400
  • e863c227b8 MAVRIC-2117: Added scale script (for mouse) Brown, Caleb M 2023-10-24 14:49:28 -0400
  • da375fa57a MAVRIC-2117: Updated DragRotation to rotate relative to the camera's orientation Brown, Caleb M 2023-10-24 14:48:53 -0400
  • e13644adf5 MAVRIC-2116 added qr code Noah 2023-10-24 14:41:21 -0400
  • 39edf1c81a MAVRIC-2117: Reformatted AR Content prefabs Brown, Caleb M 2023-10-23 14:08:00 -0400
  • c01ff80c6f added in mode switching to content picker Abraham Blain 2023-10-23 10:51:21 -0400
  • 8f202c66b0 MAVRIC-2116 update Network menu Noah 2023-10-23 10:43:07 -0400
  • fa6dcaa5f8 placed deselect code in single place Abraham Blain 2023-10-23 10:10:39 -0400
  • 7425ff4c5d Updated content picker selection Abraham Blain 2023-10-23 09:32:09 -0400
  • 5bba17c3d5 MAVRIC-2117: Removed missing script Brown, Caleb M 2023-10-23 08:48:20 -0400
  • 17cca7a648 MAVRIC-2117: Added device simulator devices package Brown, Caleb M 2023-10-23 08:23:39 -0400
  • 875e53024c MAVRIC-2117: Updated ARContent prefabs with new DragRotation script Brown, Caleb M 2023-10-23 08:23:14 -0400
  • 3b1a755b81 MAVRIC-2117: Added unity events to help handle state changes (enable/disable DragRotation script) based on selection Brown, Caleb M 2023-10-23 08:22:20 -0400
  • 42e6433d46 MAVRIC-2117: Added new input action map to grab the proper inputs Brown, Caleb M 2023-10-23 08:21:07 -0400
  • cddc731d7b MAVRIC-2117: Created a component that can rotate a target transform based on an input Brown, Caleb M 2023-10-23 08:20:40 -0400
  • 841b117f61 MAVRIC-2116 update editor UI Noah 2023-10-20 14:28:53 -0400
  • 5831de9c51 MAVRIC-2113 update animation Noah 2023-10-20 14:26:51 -0400
  • 48782d9ff4 MAVRIC-2113 Update material Noah 2023-10-20 14:25:16 -0400
  • 54c8493390 MAVRIC-2113 update foam guide Noah 2023-10-20 10:32:04 -0400
  • 8fa795913a Merge pull request 'Network Spawning Refactor' (#9) from feature/Network-Spawning-Refactor into development Demo-10-18-2023 Joshua Latham 2023-10-17 18:49:34 +0000
  • 87aa9f1a77 Merge remote-tracking branch 'origin/development' into feature/Network-Spawning-Refactor feature/Network-Spawning-Refactor Abraham Blain 2023-10-17 14:11:09 -0400
  • 48db2e3834 Merge pull request 'feature/MAVRIC-2106_UI_Update' (#10) from feature/MAVRIC-2106_UI_Update into development Joshua Latham 2023-10-17 18:09:10 +0000
  • 5b9470691f Merge remote-tracking branch 'origin/feature/MAVRIC-2106_UI_Update' into feature/Network-Spawning-Refactor Abraham Blain 2023-10-17 14:06:54 -0400
  • e28512e715 Merge remote-tracking branch 'origin/feature/MAVRIC-2106_UI_Update' into feature/Network-Spawning-Refactor Abraham Blain 2023-10-17 14:06:27 -0400
  • b07f94bb2d MAVRIC-2106 update button background Noah 2023-10-17 14:05:56 -0400
  • 29b17828c7 added skip button to wait connection screen, and added screen back in Abraham Blain 2023-10-17 13:51:48 -0400
  • 84acfb2ed2 MAVRIC-2106 Switch hide model to old model Noah 2023-10-17 13:37:54 -0400
  • 3cad511ccc fixed anchors for cached image and clear button Abraham Blain 2023-10-17 13:28:22 -0400
  • bd6d47cfb2 Fixed raycast bug and updated follow transform Abraham Blain 2023-10-17 13:19:48 -0400
  • 15adc42391 Merge branch 'development' into feature/MAVRIC-2106_UI_Update Noah 2023-10-17 13:09:05 -0400
  • a59d47b1c8 MAVRIC-2106 fine tuning Noah 2023-10-17 12:44:58 -0400
  • 9f098ac3ed Moved ar content anchor off of guide model Abraham Blain 2023-10-17 11:57:21 -0400
  • acf8482c1c added clear cache button and adjusted colliders Abraham Blain 2023-10-17 11:34:23 -0400
  • 9681edff42 cleaned up folder and namespace structure, added content material swap Abraham Blain 2023-10-17 10:46:25 -0400