|
|
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
c81cd6d2af, reversing
changes made to 426c11863a.
|
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 |
|
Brown, Caleb M
|
09a2094b5a
|
MAVRIC-2183: Prefab changes reflecting new property name
|
2023-11-10 15:23:46 -05:00 |
|
Brown, Caleb M
|
6569dad7b6
|
MAVRIC-2183: Updated locking boolean to be a little bit better
|
2023-11-10 15:23:13 -05:00 |
|
Brown, Caleb M
|
f8ee8dcf35
|
MAVRIC-2183: Update to Odin Inspector
|
2023-11-10 15:15:01 -05:00 |
|
Brown, Caleb M
|
ba8304e6ff
|
MAVRIC-2183: Refactor Lock property fix
|
2023-11-10 15:14:08 -05:00 |
|
Brown, Caleb M
|
f03fd52026
|
Merge branch 'development' into bugfix/MAVRIC-2183_Flip-Arm-Socket-ZFighting
# Conflicts:
# Assets/Prefabs/Cartridge-Interactable.prefab
|
2023-11-10 12:32:27 -05:00 |
|
Brown, Caleb M
|
31b85dcef2
|
MAVRIC-2183: Updated class names to be more acturate as to what they do
|
2023-11-10 11:59:29 -05:00 |
|
Brown, Caleb M
|
8ce0ba02a2
|
MAVRIC-2183: Updated steps locking instructions
|
2023-11-10 11:39:19 -05:00 |
|
Brown, Caleb M
|
b1d8567a52
|
MAVIRC-2183: Fixed Locking Interactable Filter
|
2023-11-10 11:38:51 -05:00 |
|
Brown, Caleb M
|
2f81a2f972
|
MAVRIC-2183: Updated Flip Arm Door hover model scale
|
2023-11-10 09:24:14 -05:00 |
|
Brown, Caleb M
|
48f3c78be6
|
MAVRIC-2178: Removed more socket box colliders
|
2023-11-10 07:39:10 -05:00 |
|
Brown, Caleb M
|
87181066cd
|
MAVRIC-2178: Updated socket triggers to be larger sphere colliders
|
2023-11-09 16:10:23 -05:00 |
|
Brown, Caleb M
|
4ef82cd7f3
|
MAVRIC-2176: Updated Next/Reset UI Buttons depress distance, rotation, and scale
|
2023-11-09 13:04:01 -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 |
|
Brown, Caleb M
|
56908d5690
|
HOTFIX: UI Buttons
|
2023-11-08 07:37:05 -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
|
67b0192cb4
|
Merge branch 'development' into feature/fortus-room
|
2023-11-07 22:53:52 -05:00 |
|
