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
|
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
|
54510b09ae
|
MAVIRC-2175: Updated Thumbwheel step logic to use the new thumbwheel step
|
2023-11-07 19:22:51 -05:00 |
|
Brown, Caleb M
|
547015e032
|
MAVRIC-2175: Fix for inside pad physics being mean
|
2023-11-07 14:18:01 -05:00 |
|
Brown, Caleb M
|
640c5b5c9d
|
MAVRIC-2175: [WIP] Trying to figure out a solid way to trigger the next step channel via a socket
|
2023-11-07 12:04:58 -05:00 |
|
Brown, Caleb M
|
445f5a3f1a
|
MAVRIC-2175: [WIP] Updated how interactables and sockets are getting locked and unlocked
|
2023-11-07 10:52:49 -05:00 |
|
Brown, Caleb M
|
1d0828181d
|
mavric-2175: [WIP] Trying to figure out how to control what interactable/socket is "enabled" at a specific step
|
2023-11-06 19:46:08 -05:00 |
|
Brown, Caleb M
|
b3d1f45f0c
|
MAVRIC-2175: FIgured out most of the grab interactions/socket interactions should work
|
2023-11-06 14:46:23 -05:00 |
|
Brown, Caleb M
|
5268622fc7
|
MAVRIC-2127: Added a capsule that scales in the direction ot the thumbwheel
|
2023-11-03 13:38:36 -04:00 |
|
Brown, Caleb M
|
9e8291b686
|
MAVIRC-2127: Moved a component
|
2023-11-03 12:41:55 -04:00 |
|
Brown, Caleb M
|
eebda1a48a
|
MAVRIC-2127: Fixed missing scripts
|
2023-11-03 12:38:48 -04:00 |
|
Brown, Caleb M
|
20b62c47bb
|
MAVRIC-2127: Added Slide interaction to the Thumbwheel
|
2023-11-03 12:34:22 -04:00 |
|
Noah
|
4ac85495a2
|
MAVRIC-2110 fixed animation and added first step
|
2023-11-01 16:37:35 -04:00 |
|
Noah
|
bab3773862
|
added model and prefabs
|
2023-11-01 10:51:29 -04:00 |
|