diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 5dd9080..4477347 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -142,9 +142,12 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_System_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Menu_Click) +ActionMappings=(ActionName="MenuToggleRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Menu_Click) -+ActionMappings=(ActionName="GrabPullRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click) +ActionMappings=(ActionName="GrabPullLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click) +ActionMappings=(ActionName="GrabPullRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=RightMouseButton) ++ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click) ++ActionMappings=(ActionName="ScaleWorldUp",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=X) ++ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Z) ++ActionMappings=(ActionName="ScaleWorldDown",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_B_Click) +AxisMappings=(AxisName="MovementAxisLeft_X",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) +AxisMappings=(AxisName="GrabAxisLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) +AxisMappings=(AxisName="MovementAxisLeft_Y",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) @@ -187,8 +190,9 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=ValveIndex_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=MixedReality_Right_Thumbstick_Y) +AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=Vive_Right_Trackpad_Y) -+AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=OculusTouch_Right_A_Click) +AxisMappings=(AxisName="TeleportationAxis",Scale=1.000000,Key=OculusTouch_Right_A_Click) ++AxisMappings=(AxisName="MovementAxisRight_Y",Scale=1.000000,Key=D) ++AxisMappings=(AxisName="MovementAxisRight_X",Scale=1.000000,Key=A) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=None diff --git a/Content/Materials/M_vingette.uasset b/Content/Materials/M_vingette.uasset index b2415a2..182ac7b 100644 --- a/Content/Materials/M_vingette.uasset +++ b/Content/Materials/M_vingette.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e52fa363793686f2470a3b89175d3359c4809f5164e604b45bda9dac9b015bb3 -size 94690 +oid sha256:0c5f923bd763dfaf878b4ad0fa4f621b66547dcaf88183b4ec650048c6627d30 +size 92729 diff --git a/Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset b/Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset new file mode 100644 index 0000000..2f08f99 --- /dev/null +++ b/Content/VRTemplate/Blueprints/Grabbable_Bottle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3acb090bf0f92d8d4a6ef81adc637876b2245855f8f8d71bffdeffab45c59c93 +size 22916 diff --git a/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset b/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset index 18d6734..86976f3 100644 --- a/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset +++ b/Content/VRTemplate/Blueprints/VRPawnWithGrab.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9bd7961cf0cad541159d4386215f76a5c7c43751bfb9800f05ce42296f9191d9 -size 864145 +oid sha256:6e854696f80e192d8ae5a549bc34fb5165f1acd63d2afa1b71f6a23513c6d76f +size 868844 diff --git a/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap b/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap index 938df81..0f006bb 100644 --- a/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap +++ b/Content/VRTemplate/Maps/VRMapGrabLocomotion.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c3994c2b7c6bbb3763640e00f1cfb52d8c36cc01cf5e6d696dfb5dcd81bbfbc -size 136576 +oid sha256:c9134c4011920c98171f897653192c70d9e94f7a6e127a4bfe143957f5c2ec82 +size 138662 diff --git a/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset b/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset index 5ee0fc7..0154f5c 100644 --- a/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset +++ b/Content/VRTemplate/Maps/VRMapGrabLocomotion_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:26db8a9939f50cd88646c48a7160dc6e8fd991b097950f320697779ddb36527c -size 7187425 +oid sha256:88e5e268ded6386e73aacff2968fcb38a0c6d67ecba916fc990bd9408805ebd3 +size 7188375