diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 9843d81..4bdd66f 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -201,6 +201,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_Grip_Axis) ++AxisMappings=(AxisName="AxisGrabLeft",Scale=1.000000,Key=OculusTouch_Left_Grip_Axis) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=None diff --git a/Content/Blueprints/GamePlay/BP_Butyrometer.uasset b/Content/Blueprints/GamePlay/BP_Butyrometer.uasset index 606406c..724d79e 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_Chalk.uasset b/Content/Blueprints/GamePlay/BP_Chalk.uasset new file mode 100644 index 0000000..665b9fb Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_Chalk.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Cork.uasset b/Content/Blueprints/GamePlay/BP_Cork.uasset new file mode 100644 index 0000000..e7a62bd Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_Cork.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Dispenser.uasset b/Content/Blueprints/GamePlay/BP_Dispenser.uasset index a2cb5fb..6d120e9 100644 Binary files a/Content/Blueprints/GamePlay/BP_Dispenser.uasset and b/Content/Blueprints/GamePlay/BP_Dispenser.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset b/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset new file mode 100644 index 0000000..db41309 Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Liquid.uasset b/Content/Blueprints/GamePlay/BP_Liquid.uasset new file mode 100644 index 0000000..941ce44 Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_Liquid.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset b/Content/Blueprints/GamePlay/BP_LiquidButyrometer.uasset index 78d87fb..248f146 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_LiquidPipette.uasset b/Content/Blueprints/GamePlay/BP_LiquidPipette.uasset index 8911db3..6279f69 100644 Binary files a/Content/Blueprints/GamePlay/BP_LiquidPipette.uasset and b/Content/Blueprints/GamePlay/BP_LiquidPipette.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_MilkCup.uasset b/Content/Blueprints/GamePlay/BP_MilkCup.uasset new file mode 100644 index 0000000..6967a20 Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_MilkCup.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Pipette.uasset b/Content/Blueprints/GamePlay/BP_Pipette.uasset index b792f34..c6adef7 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_Pump.uasset b/Content/Blueprints/GamePlay/BP_Pump.uasset index cdb5006..71a3787 100644 Binary files a/Content/Blueprints/GamePlay/BP_Pump.uasset and b/Content/Blueprints/GamePlay/BP_Pump.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset b/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset new file mode 100644 index 0000000..1fbd2a9 Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Towel.uasset b/Content/Blueprints/GamePlay/BP_Towel.uasset new file mode 100644 index 0000000..7a377ea Binary files /dev/null and b/Content/Blueprints/GamePlay/BP_Towel.uasset differ diff --git a/Content/Blueprints/GamePlay/Liquid.uasset b/Content/Blueprints/GamePlay/Liquid.uasset index f2c8bde..328037e 100644 Binary files a/Content/Blueprints/GamePlay/Liquid.uasset and b/Content/Blueprints/GamePlay/Liquid.uasset differ diff --git a/Content/Blueprints/GamePlay/MilkCup.uasset b/Content/Blueprints/GamePlay/MilkCup.uasset index 99a6419..6a31401 100644 Binary files a/Content/Blueprints/GamePlay/MilkCup.uasset and b/Content/Blueprints/GamePlay/MilkCup.uasset differ diff --git a/Content/Models/DispencerLess/Liquid/MI_Glass.uasset b/Content/Models/DispencerLess/Liquid/MI_Glass.uasset new file mode 100644 index 0000000..ce622ec Binary files /dev/null and b/Content/Models/DispencerLess/Liquid/MI_Glass.uasset differ diff --git a/Content/Models/DispencerLess/Liquid/M_Bungs_Chalk_Peal.uasset b/Content/Models/DispencerLess/Liquid/M_Bungs_Chalk_Peal.uasset new file mode 100644 index 0000000..4a41b1a Binary files /dev/null and b/Content/Models/DispencerLess/Liquid/M_Bungs_Chalk_Peal.uasset differ diff --git a/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset b/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset new file mode 100644 index 0000000..3cb0c6d Binary files /dev/null and b/Content/Models/DispencerLess/Liquid/alcohol_liquid_main.uasset differ diff --git a/Content/Models/DispencerLess/Liquid/alcohol_liquid_small.uasset b/Content/Models/DispencerLess/Liquid/alcohol_liquid_small.uasset new file mode 100644 index 0000000..2d213de Binary files /dev/null and b/Content/Models/DispencerLess/Liquid/alcohol_liquid_small.uasset differ diff --git a/Content/Models/Equipment/Pipette/LiquidPipette/LiquidPipette.uasset b/Content/Models/Equipment/Pipette/LiquidPipette/LiquidPipette.uasset new file mode 100644 index 0000000..7c2b6a7 Binary files /dev/null and b/Content/Models/Equipment/Pipette/LiquidPipette/LiquidPipette.uasset differ diff --git a/Content/Models/Equipment/Pipette/LiquidPipette/MI_Glass.uasset b/Content/Models/Equipment/Pipette/LiquidPipette/MI_Glass.uasset new file mode 100644 index 0000000..587c4f7 Binary files /dev/null and b/Content/Models/Equipment/Pipette/LiquidPipette/MI_Glass.uasset differ diff --git a/Content/Models/Equipment/Pipette/SM_Pipette.uasset b/Content/Models/Equipment/Pipette/SM_Pipette.uasset new file mode 100644 index 0000000..5eff346 Binary files /dev/null and b/Content/Models/Equipment/Pipette/SM_Pipette.uasset differ diff --git a/Content/Models/Gloves/Animations/ABP_Glove.uasset b/Content/Models/Gloves/Animations/ABP_Glove.uasset index 662e434..b5cfa5e 100644 Binary files a/Content/Models/Gloves/Animations/ABP_Glove.uasset and b/Content/Models/Gloves/Animations/ABP_Glove.uasset differ diff --git a/Content/Models/Laboratory/SM_Laboratory.uasset b/Content/Models/Laboratory/SM_Laboratory.uasset index bc0c40e..3d26b11 100644 Binary files a/Content/Models/Laboratory/SM_Laboratory.uasset and b/Content/Models/Laboratory/SM_Laboratory.uasset differ diff --git a/Content/Models/Laboratory/SM_Laboratory_Out.uasset b/Content/Models/Laboratory/SM_Laboratory_Out.uasset index ee0c0e2..aa09dbe 100644 Binary files a/Content/Models/Laboratory/SM_Laboratory_Out.uasset and b/Content/Models/Laboratory/SM_Laboratory_Out.uasset differ diff --git a/Content/Models/Sink/SM_rakovina.uasset b/Content/Models/Sink/SM_rakovina.uasset index dc2650a..e0cb73c 100644 Binary files a/Content/Models/Sink/SM_rakovina.uasset and b/Content/Models/Sink/SM_rakovina.uasset differ diff --git a/Content/Models/Tables/IslandTable/SM_Island_table_and_rack_1200.uasset b/Content/Models/Tables/IslandTable/SM_Island_table_and_rack_1200.uasset index 5d26932..efdad6e 100644 Binary files a/Content/Models/Tables/IslandTable/SM_Island_table_and_rack_1200.uasset and b/Content/Models/Tables/IslandTable/SM_Island_table_and_rack_1200.uasset differ diff --git a/Content/Models/Tables/Table2/SM_Table2.uasset b/Content/Models/Tables/Table2/SM_Table2.uasset index a57f8d1..382e95c 100644 Binary files a/Content/Models/Tables/Table2/SM_Table2.uasset and b/Content/Models/Tables/Table2/SM_Table2.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset index 350d59e..c1234ba 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 cd3f74e..2166c71 100644 Binary files a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset and b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset differ diff --git a/Content/VirtualRealityBP/Maps/MotionControllerMap.umap b/Content/VirtualRealityBP/Maps/MotionControllerMap.umap index 5697cab..53d1b90 100644 Binary files a/Content/VirtualRealityBP/Maps/MotionControllerMap.umap and b/Content/VirtualRealityBP/Maps/MotionControllerMap.umap differ diff --git a/Content/VirtualRealityBP/Maps/MotionControllerMap_2.umap b/Content/VirtualRealityBP/Maps/MotionControllerMap_2.umap index 85e40a6..6aa4e41 100644 Binary files a/Content/VirtualRealityBP/Maps/MotionControllerMap_2.umap and b/Content/VirtualRealityBP/Maps/MotionControllerMap_2.umap differ diff --git a/Content/VirtualRealityBP/Maps/TestMap.umap b/Content/VirtualRealityBP/Maps/TestMap.umap new file mode 100644 index 0000000..e36317e Binary files /dev/null and b/Content/VirtualRealityBP/Maps/TestMap.umap differ