Kip Taylor
3155fb7f67
Merge remote-tracking branch 'origin/test/yaml-merge' into bugfix/Kip-Fix-It-All
...
# Conflicts:
# Assets/Prefabs/LabSpace.prefab
2024-02-01 12:02:16 -05:00
dd089d2b22
Merge Conflicts & Override Changes
...
Override changes for the entire room to ensure heirchary conflicts are solved and static / no static issues.
Deleted Emergency button
Rebaked lighting
Checked general static issues
Aside from canvas and buttons / backboard Did not mess with any other tutorial objects
2024-01-12 14:23:01 -05:00
87d73beaa9
Teleportation area fix
...
Added a new teleportation area locked to right infront of strat
2024-01-08 20:11:21 -05:00
0df17c71f0
Revert "Merge remote-tracking branch 'origin/development' into test/input-test"
...
This reverts commit Package issues
c81cd6d2af426c11863a
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
Cody Wright
34557c7b13
Applied changed to the Cartridge_V3 Variant Interactable.prefab
...
Applied the made changes to the parts that are affected by gravity on the cartridge
2023-12-15 16:11:42 -05:00
49c64eeb2f
Fixed Scenes
...
- added the scenes to separate them correctly
2023-12-14 15:16:14 -05:00
bddafeb271
Added locomotion input testing
...
- Added teleport to new and old scene
- Bugged movement for controller
2023-12-14 15:07:14 -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
12f35684f3
Added Locomotion and tele area
...
- Retargeted a new teleport area
- Added a new locomotion area
2023-12-04 07:32:17 -05:00
Abraham Blain
21bffe68b7
re-enabled flip arm
2023-11-14 14:27:15 -05:00
Abraham Blain
1ed1b0b311
removed debug cubes, and refactored xrscroll event
2023-11-14 13:46:05 -05:00
Abraham Blain
cd5af28a09
created xr scroll component
2023-11-14 11:51:12 -05:00
Joshua Latham
77c551632d
Added stick movement to left hand to adjust position and hopefullly fixed buttons in stand alone build
2023-11-08 11:56:01 -05:00
Brown, Caleb M
94ae755b93
HOTFIX: Reverted "static" objects that shouldn't be static
2023-11-08 08:00:44 -05:00
Joshua Latham
a62d58519f
Updated lighting
2023-11-08 01:10:12 -05:00
Joshua Latham
96bf6a2156
Stratasys MC450 VR v1.0
2023-11-08 00:49:01 -05:00
Joshua Latham
03606d3b62
Merge branch 'development' into feature/fortus-room
2023-11-07 22:02:44 -05:00
Joshua Latham
554d7b5caa
Added furnishings prefabs, models, and materials
2023-11-07 21:36:29 -05:00
Joshua Latham
cc0145e7d6
Merge branch 'development' into feature/fortus-room
2023-11-07 19:35:22 -05:00
Brown, Caleb M
9795b0e526
Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step
2023-11-07 19:11:20 -05:00
Joshua Latham
323a6b5b86
First pass at updated room design
2023-11-07 18:37:30 -05:00
Brown, Caleb M
c7abf5fb73
MAVRIC-2175: Updated origin position to be closer to the table
2023-11-07 14:23:44 -05:00
Brown, Caleb M
63b72c0ee4
Merge branch 'development' into feature/MAVRIC-2175_Socket-Complete-Step
...
# Conflicts:
# Assets/Prefabs/Cartridge-Interactable.prefab
# Assets/Scenes/BasicScene.unity
2023-11-07 13:50:44 -05:00
Calderon, Noah
ec8bbc9e52
Merge branch 'development' into feature/MAVRIC-2174_Update_Info_Board
2023-11-07 13:46:11 -05:00
Joshua Latham
e39ed3d013
Reorganized prefabs and test scenes.
2023-11-07 13:22:50 -05:00
Brown, Caleb M
441fb7aedc
MAVRIC-2175: Added a next step button to the scene because I can't get the socket logic working properly
2023-11-07 12:05:41 -05:00
Joshua Latham
d72630105f
Fixed teleportation. Hands are offset from the head now though.
2023-11-06 23:32:54 -05:00
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
190506bc46
Created MAVRIC XR Hands Origing rig prefab
2023-11-06 12:02:30 -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
Joshua Latham
d7c13a014a
Updated lighting
2023-11-06 07:20:30 -05:00
Noah
b1fb92807f
MAVRIC-2174 save point
2023-11-05 22:05:29 -05:00
Joshua Latham
9e1b249f4a
Updated room model and lighting
2023-11-03 14:14:26 -04:00
Noah
4ac85495a2
MAVRIC-2110 fixed animation and added first step
2023-11-01 16:37:35 -04: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
1dea5a0c4c
Adding XR project and BasicScene for Stratasys development
2023-10-30 08:42:18 -04:00
