Commit Graph

28 Commits

Author SHA1 Message Date
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
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
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
Abraham Blain
c2c71370ec added part explosion step to procedure 2023-11-03 09:21:55 -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
Brown, Caleb M
920ca42e7d BUGFIX: Updated unity packages to latest 2023-11-02 11:50:23 -04:00
Brown, Caleb M
cdc400a920 BUGFIX: Reimported Odin Inspector 2023-11-02 11:47:12 -04:00
Noah
f73abd1d4e MAVRIC-2110 Changed animations 2023-11-02 10:10:20 -04:00
Noah
4ac85495a2 MAVRIC-2110 fixed animation and added first step 2023-11-01 16:37:35 -04:00
Noah
86dd319cf1 Merge branch 'development' into feature/MAVRIC-2110_Import_Stratsys_AR_Content 2023-11-01 14:45:10 -04:00
Joshua Latham
3e89119b72 Merge pull request 'added model and prefabs' (#2) from MAVRIC_make_prefabs_and_add_can into development
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/2
2023-11-01 16:35:13 +00:00
Noah
33ae462d75 MAVRIC changing out spool 2023-11-01 12:19:10 -04:00
Noah
bab3773862 added model and prefabs 2023-11-01 10:51:29 -04:00
Joshua Latham
d0b9d03691 Merge pull request 'Added XR Foundation project' (#1) from feature/MAVRIC-2109-new-vr-project into development
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-450mc-VR/pulls/1
2023-10-31 17:18:50 +00:00
Joshua Latham
1dea5a0c4c Adding XR project and BasicScene for Stratasys development 2023-10-30 08:42:18 -04:00
Joshua Latham
6123092f80 Adding .gitignore and .gitattributes 2023-10-30 08:40:21 -04:00
Joshua Latham
cb0c370fe2 Initial commit 2023-10-13 18:03:33 +00:00