Kip Taylor
4d62d0d333
Merge branch 'bugfix/merge03' into bugfix/Fit-It-All-Walkup
...
# Conflicts:
# Assets/Prefabs/XR Rigs/Working/MAVRIC XR Hands Origin v2.prefab
# Assets/Scenes/BasicScene.unity
- Fixed Override issues and now onto our prefabs
- All merged well and took my stuff aside from walls, colliders.
2024-02-01 12:31:08 -05:00
Kip Taylor
f227150895
Merge branch 'bugfix/merge02' into bugfix/Fit-It-All-Walkup
...
# Conflicts:
# Assets/Scenes/BasicScene.unity
- Fixed overrides from prefab interactor to mav rig instead
- Yaml seemed to make the merge fine with no issues
2024-02-01 12:11:08 -05:00
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
Kip Taylor
6a49066418
Merge branch 'development' into 2256-Teleport-cleanup
...
# Conflicts:
# Assets/Prefabs/LabSpace.prefab
# Assets/Scenes/BasicScene.unity
2024-01-26 10:32:24 -05:00
Kip Taylor
11487bde36
Updated height and overrides
...
Added a fix for the camera offset to not be a giant but to match the normal height. Should be bettter and correct. Added overrides that were missed
2024-01-25 15:24:17 -05:00
Kip Taylor
69d829b733
Added final colldier check
...
Added collider to Object prefabs and ensured they are atached to prefab and not scene
2024-01-25 11:40:46 -05:00
Kip Taylor
dcb7243df6
Walls , objects, and teleportation
...
Added colliders to walls, objects , and doors. changed ray to B curve adn made it usable for very long distance.
** Small bug, sometimes the teleport function stops working after interacting with a collider.
2024-01-25 11:23:59 -05:00
Cody Wright
57acd53a68
Merge branch 'development' into feature/2177-Update-Lighting
...
# Conflicts:
# Assets/Scenes/BasicScene.unity
2024-01-25 09:20:31 -05:00
Cody Wright
97bc98470b
Merge branch 'development' into feature/2177-Update-Lighting
...
# Conflicts:
# Assets/Prefabs/LabSpace.prefab
# Assets/Scenes/BasicScene.unity
# Assets/Scenes/BasicScene/LightingData.asset
# Assets/Scenes/BasicScene/Lightmap-0_comp_dir.png
# Assets/Scenes/BasicScene/Lightmap-0_comp_light.exr
# Assets/Scenes/BasicScene/Lightmap-1_comp_dir.png
# Assets/Scenes/BasicScene/Lightmap-1_comp_light.exr
# Assets/Scenes/BasicScene/Lightmap-2_comp_dir.png
# Assets/Scenes/BasicScene/Lightmap-2_comp_light.exr
# Assets/Scenes/BasicScene/ReflectionProbe-0.exr
2024-01-24 11:52:18 -05:00
63271ac1b4
Merge branch 'development' into bugfix/2204-Fix-Teleportation-On-Vive
...
Fixed are
Added mask to teleportation are to teleport , not nothing
Fully Functions
2024-01-24 11:21:44 -05:00
fdb8699737
Hand tracking
...
Added fields and tracking with references so teleport works from right hand not shoudler
2024-01-24 10:53:28 -05:00
f8e93bec59
Fixed ray showing up
...
Ray now shows up , had to move the ray interactor a tad
2024-01-23 16:52:27 -05:00
aefb1c6e2c
Fixed teleportation bug
...
the teleportation now functions
Issues needed for next PR
- Workout the ray, distance and fix its locked state on distance from target
- Make walls and other objects non teleportable through
- Did not do any ui/ux / ease of use , saving that for next PR as to limit amount of possible bugs or changes
2024-01-22 08:12:55 -05:00
fbd34cb9dc
Update to 3.17 Unity version
...
Updated to 3.17 and opened project
2024-01-18 14:33:32 -05:00
Cody Wright
e81157c4e2
updated baked light map of light probs
...
Baked the light map using the added light probs in the scene
2024-01-18 11:01:41 -05:00
Cody Wright
bf6349ad24
WIP: Adding dynamic lights
...
Added a light probe group and moved the nodes around the scene
2024-01-16 15:18:22 -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
ef61aae2ea
Gravity fix
...
Added gravity pre bags and scripts to current input post dev merge into input.
2024-01-11 10:29:50 -05:00
d1b85234a7
Merge branch 'development' into test/input-test
...
All seems to be running correctly. Took my side of the changes for the two conflicts. Had to re add lfs files
2024-01-11 09:45:52 -05:00
Cody Wright
b4656bf24a
Fixed watch texture
...
added the missing watch texture and corrected the watch orientation
2024-01-09 15:38:27 -05:00
Cody Wright
2000dd89b7
Watch in position
...
The watch is in the correct position and shows the time
2024-01-09 13:22:13 -05:00
Brown, Caleb M
89b136ffab
MAVRIC-2185: Fixed FlipArm door socket issue
2024-01-09 13:22:11 -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
Cody Wright
1ade2108d7
Updated watch model
...
WIP: working on trying to move watch position to right wrist and follow its position and rotation
2024-01-08 15:01:39 -05:00
Cody Wright
2316a316a0
Revert "Add Watch To Wrist"
...
This reverts commit 7cbfb62cf4
2024-01-05 16:51:53 -05:00
bb85b2ab81
Checking
...
Setup getting it functioning, works
added the sdk fix
2024-01-05 16:00:12 -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
426c11863a
Version swap to planned version
...
Version swap
2024-01-05 12:51:29 -05:00
Cody Wright
7cbfb62cf4
Add Watch To Wrist
...
WIP: added watch to right hand but the origin for watch is off and causes the watch to be ofset from the wrist
2024-01-05 12:43:58 -05:00
Brown, Caleb M
453206a0f7
MAVRIC-2185: Fixed FlipArm door socket issue
2023-12-21 14:23:51 -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
Brown, Caleb M
ea3eaa6e03
BUGFIX: Fixed Rigidbody Pad to be socketed on Active
2023-12-15 12:31:30 -05:00
Brown, Caleb M
0882c6e866
BUGFIX: Fix for the InteractableLockingFilter blocking everything (including physics??) driven via the GrabInteractable when "locked"
2023-12-15 12:13:25 -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
Brown, Caleb M
7bfb0cd6ea
Added XR Input Test scene
2023-12-14 14:29:27 -05:00
52c0391d44
Added build folder
2023-12-14 09:58:40 -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
20f73c682d
Added some tracking and performance
...
- Added performance
- Added support
- Attempting to track hands for Meta
- Added " teleporting "(only semi works)
2023-11-30 08:00:17 -05:00
345ac8d576
Added meta quest movement
...
- Added metaquest movement with L/R
- Retargeted to android
2023-11-29 08:49:07 -05:00
Abraham Blain
18b2466551
changed xrscroll to inherit baseinteractable
2023-11-14 14:53:07 -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
1542176845
Simplified rotate and scale target classes, added to thumbwheel
2023-11-14 13:38:38 -05:00
Abraham Blain
cd5af28a09
created xr scroll component
2023-11-14 11:51:12 -05:00
Joshua Latham
96a98fbe03
Merge branch 'development' into feature/MAVRIC-2181-hands
2023-11-10 16:58:29 -05:00
Joshua Latham
08c6d19c77
Fixed direction and interaction of Ray interactors on hands. Continuing to work on teleportation
2023-11-10 16:50:09 -05:00
