diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 4bdd66f..9330a41 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -128,12 +128,10 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Daydream_Left_Select_Click) +ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Left_Trigger) +ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Left_Trigger_Click) -+ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click) +ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trigger_Click) +ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Daydream_Right_Select_Click) +ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MagicLeap_Right_Trigger) +ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=MixedReality_Right_Trigger_Click) -+ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click) +ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trigger_Click) +ActionMappings=(ActionName="HMDTeleport",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +ActionMappings=(ActionName="HMDTeleport",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) @@ -157,6 +155,10 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="TeleportRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Thumbstick_X) +ActionMappings=(ActionName="TeleportRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=ValveIndex_Right_Thumbstick_Y) +ActionMappings=(ActionName="TeleportRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Click) ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click) ++ActionMappings=(ActionName="GrabRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Grip_Click) ++ActionMappings=(ActionName="GrabLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Grip_Click) +AxisMappings=(AxisName="LookUp",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="LookUpRate",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="MotionControllerThumbLeft_X",Scale=1.000000,Key=Daydream_Left_Trackpad_X) @@ -201,6 +203,8 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Gamepad_RightX) +AxisMappings=(AxisName="TurnRate",Scale=-1.000000,Key=Left) +AxisMappings=(AxisName="TurnRate",Scale=1.000000,Key=Right) ++AxisMappings=(AxisName="AxisGrabRight",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) ++AxisMappings=(AxisName="AxisGrabLeft",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) +AxisMappings=(AxisName="AxisGrabRight",Scale=1.000000,Key=OculusTouch_Right_Grip_Axis) +AxisMappings=(AxisName="AxisGrabLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) DefaultPlayerInputClass=/Script/Engine.PlayerInput diff --git a/Content/Blueprints/Game/BP_GameMode.uasset b/Content/Blueprints/Game/BP_GameMode.uasset new file mode 100644 index 0000000..c5ae5cc Binary files /dev/null and b/Content/Blueprints/Game/BP_GameMode.uasset differ diff --git a/Content/Blueprints/Game/BP_PlayerController.uasset b/Content/Blueprints/Game/BP_PlayerController.uasset new file mode 100644 index 0000000..9e5f789 Binary files /dev/null and b/Content/Blueprints/Game/BP_PlayerController.uasset differ diff --git a/Content/Blueprints/Game/BP_SpectratorPawn.uasset b/Content/Blueprints/Game/BP_SpectratorPawn.uasset new file mode 100644 index 0000000..9830c34 Binary files /dev/null and b/Content/Blueprints/Game/BP_SpectratorPawn.uasset differ diff --git a/Content/Blueprints/Game/NewBlueprint.uasset b/Content/Blueprints/Game/NewBlueprint.uasset new file mode 100644 index 0000000..65951fd Binary files /dev/null and b/Content/Blueprints/Game/NewBlueprint.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Butyrometer.uasset b/Content/Blueprints/GamePlay/BP_Butyrometer.uasset index 6deb2ec..ca4924f 100644 Binary files a/Content/Blueprints/GamePlay/BP_Butyrometer.uasset and b/Content/Blueprints/GamePlay/BP_Butyrometer.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_ButyrometerCase.uasset b/Content/Blueprints/GamePlay/BP_ButyrometerCase.uasset index 6ee84e9..1978524 100644 Binary files a/Content/Blueprints/GamePlay/BP_ButyrometerCase.uasset and b/Content/Blueprints/GamePlay/BP_ButyrometerCase.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_FrameActor.uasset b/Content/Blueprints/GamePlay/BP_FrameActor.uasset index 8501165..1e451ba 100644 Binary files a/Content/Blueprints/GamePlay/BP_FrameActor.uasset and b/Content/Blueprints/GamePlay/BP_FrameActor.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset b/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset index c9a5790..408deda 100644 Binary files a/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset and b/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset b/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset index a749e4a..5c8d93d 100644 Binary files a/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset and b/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Logo.uasset b/Content/Blueprints/GamePlay/BP_Logo.uasset new file mode 100644 index 0000000..c37f600 Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_Logo.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Pipette.uasset b/Content/Blueprints/GamePlay/BP_Pipette.uasset index bc39426..0909aff 100644 Binary files a/Content/Blueprints/GamePlay/BP_Pipette.uasset and b/Content/Blueprints/GamePlay/BP_Pipette.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset b/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset index db881e7..6865593 100644 Binary files a/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset and b/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset differ diff --git a/Content/HUD/Textures/IconDefault.uasset b/Content/HUD/Textures/IconDefault.uasset index 27c62b3..d53520a 100644 Binary files a/Content/HUD/Textures/IconDefault.uasset and b/Content/HUD/Textures/IconDefault.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_1.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_1.uasset index 0030e44..c75e033 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_1.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_1.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_10.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_10.uasset index 7505365..d683ce9 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_10.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_10.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_11.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_11.uasset index 91a5e64..6e3b24c 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_11.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_11.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_12.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_12.uasset index 9b6ac19..80fcb46 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_12.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_12.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_2.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_2.uasset index 81843f1..ebaf00e 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_2.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_2.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_3.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_3.uasset index e7189fa..7204c7c 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_3.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_3.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_4.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_4.uasset index b660f32..d816634 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_4.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_4.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_5.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_5.uasset index cd814e4..8fc1987 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_5.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_5.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_6.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_6.uasset index 59fdf72..7150565 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_6.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_6.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_7.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_7.uasset index 38576de..02b6b43 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_7.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_7.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_8.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_8.uasset index c5a56d8..b770a20 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_8.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_8.uasset differ diff --git a/Content/HUD/Widgets/StepLists/UW_StepList_9.uasset b/Content/HUD/Widgets/StepLists/UW_StepList_9.uasset index ec76f59..71ae936 100644 Binary files a/Content/HUD/Widgets/StepLists/UW_StepList_9.uasset and b/Content/HUD/Widgets/StepLists/UW_StepList_9.uasset differ diff --git a/Content/HUD/Widgets/UW_GraffLogo.uasset b/Content/HUD/Widgets/UW_GraffLogo.uasset new file mode 100644 index 0000000..d10d3f1 Binary files /dev/null and b/Content/HUD/Widgets/UW_GraffLogo.uasset differ diff --git a/Content/HUD/Widgets/UW_SmallStep.uasset b/Content/HUD/Widgets/UW_SmallStep.uasset index ef5031b..0039333 100644 Binary files a/Content/HUD/Widgets/UW_SmallStep.uasset and b/Content/HUD/Widgets/UW_SmallStep.uasset differ diff --git a/Content/Materials/Sky.uasset b/Content/Materials/Sky.uasset index 101e701..a3e3592 100644 Binary files a/Content/Materials/Sky.uasset and b/Content/Materials/Sky.uasset differ diff --git a/Content/Materials/Textures/GraffLogo.uasset b/Content/Materials/Textures/GraffLogo.uasset new file mode 100644 index 0000000..a450f35 Binary files /dev/null and b/Content/Materials/Textures/GraffLogo.uasset differ diff --git a/Content/Materials/Textures/IMG_20210819_113847.uasset b/Content/Materials/Textures/IMG_20210819_113847.uasset new file mode 100644 index 0000000..4ff2e0a Binary files /dev/null and b/Content/Materials/Textures/IMG_20210819_113847.uasset differ diff --git a/Content/Materials/Textures/Panorama.uasset b/Content/Materials/Textures/Panorama.uasset new file mode 100644 index 0000000..a3495b2 Binary files /dev/null and b/Content/Materials/Textures/Panorama.uasset differ diff --git a/Content/Models/Byterometr/Liquid/LiquidButyrometer5.uasset b/Content/Models/Byterometr/Liquid/LiquidButyrometer5.uasset index 3233ac0..8eb1de5 100644 Binary files a/Content/Models/Byterometr/Liquid/LiquidButyrometer5.uasset and b/Content/Models/Byterometr/Liquid/LiquidButyrometer5.uasset differ diff --git a/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset b/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset index 364b38d..04dec7a 100644 Binary files a/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset and b/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset differ diff --git a/Content/Models/Equipment/Liquid/alc_liquid_SM_Equipment_SM_Bottle_001.uasset b/Content/Models/Equipment/Liquid/alc_liquid_SM_Equipment_SM_Bottle_001.uasset index 21b056f..76a5c03 100644 Binary files a/Content/Models/Equipment/Liquid/alc_liquid_SM_Equipment_SM_Bottle_001.uasset and b/Content/Models/Equipment/Liquid/alc_liquid_SM_Equipment_SM_Bottle_001.uasset differ diff --git a/Content/Models/Laboratory/M_Window.uasset b/Content/Models/Laboratory/M_Window.uasset index d09766f..4efa661 100644 Binary files a/Content/Models/Laboratory/M_Window.uasset and b/Content/Models/Laboratory/M_Window.uasset differ diff --git a/Content/VirtualReality/Materials/M_ArcEndpoint.uasset b/Content/VirtualReality/Materials/M_ArcEndpoint.uasset index ae98984..62e74cd 100644 Binary files a/Content/VirtualReality/Materials/M_ArcEndpoint.uasset and b/Content/VirtualReality/Materials/M_ArcEndpoint.uasset differ diff --git a/Content/VirtualReality/Materials/M_ArcEndpoint_2.uasset b/Content/VirtualReality/Materials/M_ArcEndpoint_2.uasset new file mode 100644 index 0000000..ff00ed6 Binary files /dev/null and b/Content/VirtualReality/Materials/M_ArcEndpoint_2.uasset differ diff --git a/Content/VirtualReality/Materials/M_SplineArcMat.uasset b/Content/VirtualReality/Materials/M_SplineArcMat.uasset index e8023a5..6190055 100644 Binary files a/Content/VirtualReality/Materials/M_SplineArcMat.uasset and b/Content/VirtualReality/Materials/M_SplineArcMat.uasset differ diff --git a/Content/VirtualReality/Materials/PointMaterial.uasset b/Content/VirtualReality/Materials/PointMaterial.uasset new file mode 100644 index 0000000..46d29f3 Binary files /dev/null and b/Content/VirtualReality/Materials/PointMaterial.uasset differ diff --git a/Content/VirtualReality/Meshes/Pointer.uasset b/Content/VirtualReality/Meshes/Pointer.uasset new file mode 100644 index 0000000..1582b7a Binary files /dev/null and b/Content/VirtualReality/Meshes/Pointer.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset index cb04ab9..5189bc1 100644 Binary files a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset and b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset index 1773b6d..7e0bbf6 100644 Binary files a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset and b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset differ diff --git a/Content/VirtualRealityBP/Maps/Laboratory.umap b/Content/VirtualRealityBP/Maps/Laboratory.umap index 647c1a8..f572624 100644 Binary files a/Content/VirtualRealityBP/Maps/Laboratory.umap and b/Content/VirtualRealityBP/Maps/Laboratory.umap differ diff --git a/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap b/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap index 829a99e..2f7035d 100644 Binary files a/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap and b/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap differ