diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index ffa8fa8..7fa4df3 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -1,5 +1,5 @@ [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/VirtualRealityBP/Maps/StartupMap.StartupMap +EditorStartupMap=/Game/VirtualRealityBP/Maps/Laboratory.Laboratory LocalMapOptions= TransitionMap=None bUseSplitscreen=True @@ -8,7 +8,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/VirtualRealityBP/Maps/MotionControllerMap.MotionControllerMap +GameDefaultMap=/Game/VirtualRealityBP/Maps/Laboratory.Laboratory ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=None GlobalDefaultServerGameMode=None diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 07bfe28..f3afbf4 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -1,6 +1,7 @@ [/Script/EngineSettings.GeneralProjectSettings] ProjectID=2E6DDDA34ECD7EC792CE77AF71F0976E ProjectName=Virtual Reality BP Game Template +bStartInVR=True [/Script/UnrealEd.ProjectPackagingSettings] BuildConfiguration=PPBC_Development @@ -25,3 +26,4 @@ bCookAll=False bCookMapsOnly=False bCompressed=False bSkipEditorContent=False + diff --git a/Content/Blueprints/GamePlay/BP_Butyrometer.uasset b/Content/Blueprints/GamePlay/BP_Butyrometer.uasset index 56a3010..e1f3bf3 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 aaf0fd7..466896f 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_ButyrometerCaseTop.uasset b/Content/Blueprints/GamePlay/BP_ButyrometerCaseTop.uasset index 042eeff..61df08e 100644 Binary files a/Content/Blueprints/GamePlay/BP_ButyrometerCaseTop.uasset and b/Content/Blueprints/GamePlay/BP_ButyrometerCaseTop.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Centrifuge.uasset b/Content/Blueprints/GamePlay/BP_Centrifuge.uasset index f788ffa..42fcd4c 100644 Binary files a/Content/Blueprints/GamePlay/BP_Centrifuge.uasset and b/Content/Blueprints/GamePlay/BP_Centrifuge.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Chalk.uasset b/Content/Blueprints/GamePlay/BP_Chalk.uasset index 9e4ce22..563b059 100644 Binary files a/Content/Blueprints/GamePlay/BP_Chalk.uasset 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 index 6995e51..a0b42be 100644 Binary files a/Content/Blueprints/GamePlay/BP_Cork.uasset and b/Content/Blueprints/GamePlay/BP_Cork.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_FLibrary.uasset b/Content/Blueprints/GamePlay/BP_FLibrary.uasset index 98f47da..aeb2328 100644 Binary files a/Content/Blueprints/GamePlay/BP_FLibrary.uasset and b/Content/Blueprints/GamePlay/BP_FLibrary.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_FrameActor.uasset b/Content/Blueprints/GamePlay/BP_FrameActor.uasset index c6fb25d..c03faf3 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_InteractionActor.uasset b/Content/Blueprints/GamePlay/BP_InteractionActor.uasset index 7a9bfd5..36ee7e4 100644 Binary files a/Content/Blueprints/GamePlay/BP_InteractionActor.uasset and b/Content/Blueprints/GamePlay/BP_InteractionActor.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Interface.uasset b/Content/Blueprints/GamePlay/BP_Interface.uasset index d0c148b..fd4d5a6 100644 Binary files a/Content/Blueprints/GamePlay/BP_Interface.uasset and b/Content/Blueprints/GamePlay/BP_Interface.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset b/Content/Blueprints/GamePlay/BP_IsoamylAlcohol.uasset index 72a205e..bb55493 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_Liquid.uasset b/Content/Blueprints/GamePlay/BP_Liquid.uasset index 56db741..e9155e4 100644 Binary files a/Content/Blueprints/GamePlay/BP_Liquid.uasset 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 b7cd5ac..c8f8160 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 6279f69..109c8ff 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 index bc124ef..45a11fa 100644 Binary files a/Content/Blueprints/GamePlay/BP_MilkCup.uasset and b/Content/Blueprints/GamePlay/BP_MilkCup.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Nest.uasset b/Content/Blueprints/GamePlay/BP_Nest.uasset index 20e4cea..ece5f02 100644 Binary files a/Content/Blueprints/GamePlay/BP_Nest.uasset and b/Content/Blueprints/GamePlay/BP_Nest.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Pipette.uasset b/Content/Blueprints/GamePlay/BP_Pipette.uasset index daa1e12..a804e98 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 591d6f2..5b9c44c 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 index 7602f65..23ba519 100644 Binary files a/Content/Blueprints/GamePlay/BP_SulfuricAcid.uasset 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 index 8abeb6d..ce53e1f 100644 Binary files a/Content/Blueprints/GamePlay/BP_Towel.uasset and b/Content/Blueprints/GamePlay/BP_Towel.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_Tripod.uasset b/Content/Blueprints/GamePlay/BP_Tripod.uasset index ff2c2d9..a9dc6f9 100644 Binary files a/Content/Blueprints/GamePlay/BP_Tripod.uasset and b/Content/Blueprints/GamePlay/BP_Tripod.uasset differ diff --git a/Content/Blueprints/GamePlay/BP_WaterBath.uasset b/Content/Blueprints/GamePlay/BP_WaterBath.uasset index 8be1834..4d2d84d 100644 Binary files a/Content/Blueprints/GamePlay/BP_WaterBath.uasset and b/Content/Blueprints/GamePlay/BP_WaterBath.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_Button.uasset b/Content/Blueprints/GamePlay/Buttons/BP_Button.uasset index 097516c..85b25e8 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_Button.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_Button.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartCentrifuge.uasset b/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartCentrifuge.uasset index cb7756b..2213911 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartCentrifuge.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartCentrifuge.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartWaterBath.uasset b/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartWaterBath.uasset index f18b3aa..cefdcb3 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartWaterBath.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_ButtonStartWaterBath.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTemp.uasset b/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTemp.uasset index a4bf264..509015f 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTemp.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTemp.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTime.uasset b/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTime.uasset index 7848319..321f133 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTime.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_DecreaseTime.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTemp.uasset b/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTemp.uasset index f355a62..631eee9 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTemp.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTemp.uasset differ diff --git a/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTime.uasset b/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTime.uasset index 42eadd9..5ebb769 100644 Binary files a/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTime.uasset and b/Content/Blueprints/GamePlay/Buttons/BP_IncreaseTime.uasset differ diff --git a/Content/Blueprints/GamePlay/LiquidComponent.uasset b/Content/Blueprints/GamePlay/LiquidComponent.uasset index 0538105..b9a58cd 100644 Binary files a/Content/Blueprints/GamePlay/LiquidComponent.uasset and b/Content/Blueprints/GamePlay/LiquidComponent.uasset differ diff --git a/Content/HUD/FrameWidget.uasset b/Content/HUD/FrameWidget.uasset index e1f0fad..f280e52 100644 Binary files a/Content/HUD/FrameWidget.uasset and b/Content/HUD/FrameWidget.uasset differ diff --git a/Content/HUD/UW_Script.uasset b/Content/HUD/UW_Script.uasset new file mode 100644 index 0000000..e62bb4e Binary files /dev/null and b/Content/HUD/UW_Script.uasset differ diff --git a/Content/HUD/UW_Step.uasset b/Content/HUD/UW_Step.uasset new file mode 100644 index 0000000..c60e933 Binary files /dev/null and b/Content/HUD/UW_Step.uasset differ diff --git a/Content/Models/Centrifuge/FixedFlask/FlaskTopFixed.uasset b/Content/Models/Centrifuge/FixedFlask/FlaskTopFixed.uasset new file mode 100644 index 0000000..31afad7 Binary files /dev/null and b/Content/Models/Centrifuge/FixedFlask/FlaskTopFixed.uasset differ diff --git a/Content/Models/DispencerLess/FixedBottleSmall.uasset b/Content/Models/DispencerLess/FixedBottleSmall.uasset new file mode 100644 index 0000000..90a79d3 Binary files /dev/null and b/Content/Models/DispencerLess/FixedBottleSmall.uasset differ diff --git a/Content/Models/DispencerLess/MI_Glass.uasset b/Content/Models/DispencerLess/MI_Glass.uasset new file mode 100644 index 0000000..fdd0570 Binary files /dev/null and b/Content/Models/DispencerLess/MI_Glass.uasset differ diff --git a/Content/Models/DispencerLess/M_Bungs_Chalk_Peal_001.uasset b/Content/Models/DispencerLess/M_Bungs_Chalk_Peal_001.uasset new file mode 100644 index 0000000..d0f94f4 Binary files /dev/null and b/Content/Models/DispencerLess/M_Bungs_Chalk_Peal_001.uasset differ diff --git a/Content/Models/DispencerLess/SM_Isoamyl_alcohol.uasset b/Content/Models/DispencerLess/SM_Isoamyl_alcohol.uasset index 828113b..c4220b9 100644 Binary files a/Content/Models/DispencerLess/SM_Isoamyl_alcohol.uasset and b/Content/Models/DispencerLess/SM_Isoamyl_alcohol.uasset differ diff --git a/Content/Models/Equipment/FixedBottleBig.uasset b/Content/Models/Equipment/FixedBottleBig.uasset new file mode 100644 index 0000000..db979ff Binary files /dev/null and b/Content/Models/Equipment/FixedBottleBig.uasset differ diff --git a/Content/Models/Equipment/MI_NewGlass.uasset b/Content/Models/Equipment/MI_NewGlass.uasset new file mode 100644 index 0000000..c53da1e Binary files /dev/null and b/Content/Models/Equipment/MI_NewGlass.uasset differ diff --git a/Content/Models/Equipment/M_Bungs_Chalk_Peal_001.uasset b/Content/Models/Equipment/M_Bungs_Chalk_Peal_001.uasset new file mode 100644 index 0000000..c425696 Binary files /dev/null and b/Content/Models/Equipment/M_Bungs_Chalk_Peal_001.uasset differ diff --git a/Content/Models/Equipment/M_Bungs_Chalk_Peal_002.uasset b/Content/Models/Equipment/M_Bungs_Chalk_Peal_002.uasset new file mode 100644 index 0000000..a1357cd Binary files /dev/null and b/Content/Models/Equipment/M_Bungs_Chalk_Peal_002.uasset differ diff --git a/Content/Models/Equipment/cork_fixed.uasset b/Content/Models/Equipment/cork_fixed.uasset new file mode 100644 index 0000000..8c9a272 Binary files /dev/null and b/Content/Models/Equipment/cork_fixed.uasset differ diff --git a/Content/Models/Equipment/fixed_chalk.uasset b/Content/Models/Equipment/fixed_chalk.uasset new file mode 100644 index 0000000..013758a Binary files /dev/null and b/Content/Models/Equipment/fixed_chalk.uasset differ diff --git a/Content/Models/Equipment/fixed_pump.uasset b/Content/Models/Equipment/fixed_pump.uasset new file mode 100644 index 0000000..b416f57 Binary files /dev/null and b/Content/Models/Equipment/fixed_pump.uasset differ diff --git a/Content/Models/Gloves/NewGloves/Animations/ABP_BigGloves.uasset b/Content/Models/Gloves/NewGloves/Animations/ABP_BigGloves.uasset index 44a58a5..42cbb5e 100644 Binary files a/Content/Models/Gloves/NewGloves/Animations/ABP_BigGloves.uasset and b/Content/Models/Gloves/NewGloves/Animations/ABP_BigGloves.uasset differ diff --git a/Content/Models/MilkForm/MilkCup.uasset b/Content/Models/MilkForm/MilkCup.uasset index ae54d10..400fed6 100644 Binary files a/Content/Models/MilkForm/MilkCup.uasset and b/Content/Models/MilkForm/MilkCup.uasset differ diff --git a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset b/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset index 3dd82e7..e4e2db0 100644 Binary files a/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset and b/Content/VirtualReality/Mannequin/Animations/RightHand_AnimBP.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController.uasset index d30c90a..50d6f82 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/BP_MotionController_2.uasset b/Content/VirtualRealityBP/Blueprints/BP_MotionController_2.uasset deleted file mode 100644 index 07eb807..0000000 Binary files a/Content/VirtualRealityBP/Blueprints/BP_MotionController_2.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Blueprints/BP_PickupCube.uasset b/Content/VirtualRealityBP/Blueprints/BP_PickupCube.uasset index 3ef9626..ecc5eb4 100644 Binary files a/Content/VirtualRealityBP/Blueprints/BP_PickupCube.uasset and b/Content/VirtualRealityBP/Blueprints/BP_PickupCube.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/HMDLocomotionPawn.uasset b/Content/VirtualRealityBP/Blueprints/HMDLocomotionPawn.uasset index 6df4a15..08462b3 100644 Binary files a/Content/VirtualRealityBP/Blueprints/HMDLocomotionPawn.uasset and b/Content/VirtualRealityBP/Blueprints/HMDLocomotionPawn.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset index 884ba32..c18e537 100644 Binary files a/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset and b/Content/VirtualRealityBP/Blueprints/MotionControllerPawn.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset b/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset index f6a7668..b3571d3 100644 Binary files a/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset and b/Content/VirtualRealityBP/Blueprints/PickupActorInterface.uasset differ diff --git a/Content/VirtualRealityBP/Blueprints/VirtualRealityPawn.uasset b/Content/VirtualRealityBP/Blueprints/VirtualRealityPawn.uasset deleted file mode 100644 index 9149a09..0000000 Binary files a/Content/VirtualRealityBP/Blueprints/VirtualRealityPawn.uasset and /dev/null differ diff --git a/Content/VirtualRealityBP/Maps/Laboratory.umap b/Content/VirtualRealityBP/Maps/Laboratory.umap index 69e75d7..9335eae 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 636f3f0..09e625f 100644 Binary files a/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap and b/Content/VirtualRealityBP/Maps/LightingAndNavigation.umap differ