diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 57b2fbae..4ae88640 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -57,6 +57,7 @@ GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C +EditProfiles=(Name="UI",CustomResponses=((Channel="UI",Response=ECR_Overlap))) +EditProfiles=(Name="Pawn",CustomResponses=((Channel="Pawn",Response=ECR_Ignore),(Channel="PhysicsBody",Response=ECR_Ignore),(Channel="walls"),(Channel="WorldStatic",Response=ECR_Ignore),(Channel="WorldDynamic",Response=ECR_Overlap),(Channel="Camera",Response=ECR_Ignore),(Channel="Vehicle",Response=ECR_Ignore),(Channel="Destructible",Response=ECR_Ignore),(Channel="GrassFinding",Response=ECR_Ignore))) +EditProfiles=(Name="Spectator",CustomResponses=((Channel="walls"))) ++EditProfiles=(Name="InvisibleWall",CustomResponses=((Channel="Camera",Response=ECR_Ignore))) -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 2e5a10b1..4c9da35a 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -1,14 +1,6 @@ <<<<<<< Updated upstream -[/Script/Engine.InputSettings] -bUseMouseForTouch=True -DefaultTouchInterface=None -bEnableMouseSmoothing=False -DefaultViewportMouseCaptureMode=NoCapture -DefaultViewportMouseLockMode=LockOnCapture -bCaptureMouseOnLaunch=False -======= [/Script/Engine.InputSettings] -AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) -AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f)) @@ -90,10 +82,12 @@ DefaultViewportMouseCaptureMode=NoCapture DefaultViewportMouseLockMode=LockOnCapture FOVScale=0.011110 DoubleClickTime=0.200000 -+ActionMappings=(ActionName="teleportL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trackpad_Click) +ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Left_Trigger_Click) -+ActionMappings=(ActionName="teleportR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trackpad_Click) +ActionMappings=(ActionName="troggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Vive_Right_Trigger_Click) ++ActionMappings=(ActionName="triggerL",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Trigger_Click) ++ActionMappings=(ActionName="troggerR",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_Trigger_Click) ++ActionMappings=(ActionName="menu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_X_Click) ++ActionMappings=(ActionName="menu",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Right_A_Click) +AxisMappings=(AxisName="right",Scale=1.000000,Key=Right) +AxisMappings=(AxisName="forward",Scale=1.000000,Key=Up) +AxisMappings=(AxisName="right",Scale=-1.000000,Key=Left) @@ -102,9 +96,9 @@ DoubleClickTime=0.200000 +AxisMappings=(AxisName="forward",Scale=-1.000000,Key=Down) +AxisMappings=(AxisName="forward",Scale=1.000000,Key=W) +AxisMappings=(AxisName="forward",Scale=-1.000000,Key=S) ++AxisMappings=(AxisName="VRtrigger",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) DefaultTouchInterface=None -ConsoleKeys=Tilde +ConsoleKeys=Tilde +ConsoleKeys=None ->>>>>>> Stashed changes diff --git a/Content/Assetpacks/Flowers_Plants_Part1/Materials/Instances/MI_CornusAlba_01.uasset b/Content/Assetpacks/Flowers_Plants_Part1/Materials/Instances/MI_CornusAlba_01.uasset index 2aa33786..98ad6e6c 100644 Binary files a/Content/Assetpacks/Flowers_Plants_Part1/Materials/Instances/MI_CornusAlba_01.uasset and b/Content/Assetpacks/Flowers_Plants_Part1/Materials/Instances/MI_CornusAlba_01.uasset differ diff --git a/Content/Assetpacks/Flowers_Plants_Part1/Materials/M_PlantsMasterMaterial.uasset b/Content/Assetpacks/Flowers_Plants_Part1/Materials/M_PlantsMasterMaterial.uasset index e46e0977..2f4af958 100644 Binary files a/Content/Assetpacks/Flowers_Plants_Part1/Materials/M_PlantsMasterMaterial.uasset and b/Content/Assetpacks/Flowers_Plants_Part1/Materials/M_PlantsMasterMaterial.uasset differ diff --git a/Content/Assetpacks/ThreeDee/Meshes/Furniture/Fruits/SM_Apple_Red.uasset b/Content/Assetpacks/ThreeDee/Meshes/Furniture/Fruits/SM_Apple_Red.uasset index 94eff4b7..7cada2fa 100644 Binary files a/Content/Assetpacks/ThreeDee/Meshes/Furniture/Fruits/SM_Apple_Red.uasset and b/Content/Assetpacks/ThreeDee/Meshes/Furniture/Fruits/SM_Apple_Red.uasset differ diff --git a/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_big.uasset b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_big.uasset new file mode 100644 index 00000000..5f14a8bc Binary files /dev/null and b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_big.uasset differ diff --git a/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_out.uasset b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_out.uasset new file mode 100644 index 00000000..2fed6793 Binary files /dev/null and b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_out.uasset differ diff --git a/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_small.uasset b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_small.uasset new file mode 100644 index 00000000..088766df Binary files /dev/null and b/Content/Blueprints/Lamp/BP_lampStreet_Bars_lamp_small.uasset differ diff --git a/Content/Blueprints/Player/CM.uasset b/Content/Blueprints/Player/CM.uasset index 8bb00f9e..d3354f7f 100644 Binary files a/Content/Blueprints/Player/CM.uasset and b/Content/Blueprints/Player/CM.uasset differ diff --git a/Content/Blueprints/Player/GameplayFunctions.uasset b/Content/Blueprints/Player/GameplayFunctions.uasset index 1bfc10d3..a9c18567 100644 Binary files a/Content/Blueprints/Player/GameplayFunctions.uasset and b/Content/Blueprints/Player/GameplayFunctions.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 8d9471d0..ed6be02a 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/Blyamda_LP_M_Blyamda_Emissive.uasset b/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/Blyamda_LP_M_Blyamda_Emissive.uasset index 36dfce76..2ec0a220 100644 Binary files a/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/Blyamda_LP_M_Blyamda_Emissive.uasset and b/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/Blyamda_LP_M_Blyamda_Emissive.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/MI_blyambda.uasset b/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/MI_blyambda.uasset index fc29ab59..fad66b24 100644 Binary files a/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/MI_blyambda.uasset and b/Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/MI_blyambda.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/M_SplineArcMat.uasset b/Content/Blueprints/Player/VR/Materials/M_SplineArcMat.uasset index 01862ce6..de9608ec 100644 Binary files a/Content/Blueprints/Player/VR/Materials/M_SplineArcMat.uasset and b/Content/Blueprints/Player/VR/Materials/M_SplineArcMat.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/DefaultPose.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/DefaultPose.uasset new file mode 100644 index 00000000..3400810d Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/DefaultPose.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2Left.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2Left.uasset new file mode 100644 index 00000000..ed7c2370 Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2Left.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftPhys.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftPhys.uasset new file mode 100644 index 00000000..3ea1090f Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftPhys.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftSkel.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftSkel.uasset new file mode 100644 index 00000000..1aaf36f4 Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2LeftSkel.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2Right.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2Right.uasset new file mode 100644 index 00000000..c0679391 Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2Right.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightAB.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightAB.uasset new file mode 100644 index 00000000..43de6989 Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightAB.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightPhys.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightPhys.uasset new file mode 100644 index 00000000..3e1098d0 Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightPhys.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightSkel.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightSkel.uasset new file mode 100644 index 00000000..967a04ac Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/quest2RightSkel.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0.uasset deleted file mode 100644 index 63e4b230..00000000 Binary files a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_PhysicsAsset.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_PhysicsAsset.uasset deleted file mode 100644 index e934b339..00000000 Binary files a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_Skeleton.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_Skeleton.uasset deleted file mode 100644 index 1b3e9162..00000000 Binary files a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_left_quest2_mesh_Skeleton.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_PhysicsAsset.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_PhysicsAsset.uasset deleted file mode 100644 index 70ad0d49..00000000 Binary files a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_PhysicsAsset.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_Skeleton.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_Skeleton.uasset deleted file mode 100644 index 49b6f46e..00000000 Binary files a/Content/Blueprints/Player/VR/Materials/Quest2/quest2_contollers_div0_right_quest2_mesh_Skeleton.uasset and /dev/null differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/rightTrigger.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/rightTrigger.uasset new file mode 100644 index 00000000..fd9de78e Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/rightTrigger.uasset differ diff --git a/Content/Blueprints/Player/VR/Materials/Quest2/triggerPress.uasset b/Content/Blueprints/Player/VR/Materials/Quest2/triggerPress.uasset new file mode 100644 index 00000000..6f270ccc Binary files /dev/null and b/Content/Blueprints/Player/VR/Materials/Quest2/triggerPress.uasset differ diff --git a/Content/Blueprints/Player/VR/VRHand.uasset b/Content/Blueprints/Player/VR/VRHand.uasset index 9f6ccfcc..61cda2b3 100644 Binary files a/Content/Blueprints/Player/VR/VRHand.uasset and b/Content/Blueprints/Player/VR/VRHand.uasset differ diff --git a/Content/Blueprints/Player/VR/VRPawn.uasset b/Content/Blueprints/Player/VR/VRPawn.uasset index 55788233..ea10d4aa 100644 Binary files a/Content/Blueprints/Player/VR/VRPawn.uasset and b/Content/Blueprints/Player/VR/VRPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/VRscreen.uasset b/Content/Blueprints/Player/VR/VRscreen.uasset index 796099ea..b6a89142 100644 Binary files a/Content/Blueprints/Player/VR/VRscreen.uasset and b/Content/Blueprints/Player/VR/VRscreen.uasset differ diff --git a/Content/Blueprints/Player/getFunctions.uasset b/Content/Blueprints/Player/getFunctions.uasset index e5035401..bfaefffb 100644 Binary files a/Content/Blueprints/Player/getFunctions.uasset and b/Content/Blueprints/Player/getFunctions.uasset differ diff --git a/Content/Blueprints/Player/infoHud.uasset b/Content/Blueprints/Player/infoHud.uasset index e6fd33dc..6a93ae4a 100644 Binary files a/Content/Blueprints/Player/infoHud.uasset and b/Content/Blueprints/Player/infoHud.uasset differ diff --git a/Content/Blueprints/Player/myGM.uasset b/Content/Blueprints/Player/myGM.uasset index 04a15f1b..8402cc14 100644 Binary files a/Content/Blueprints/Player/myGM.uasset and b/Content/Blueprints/Player/myGM.uasset differ diff --git a/Content/Blueprints/UI/Actors/InfraPoint.uasset b/Content/Blueprints/UI/Actors/InfraPoint.uasset index 36068faa..d751d3fd 100644 Binary files a/Content/Blueprints/UI/Actors/InfraPoint.uasset and b/Content/Blueprints/UI/Actors/InfraPoint.uasset differ diff --git a/Content/Blueprints/UI/Imgs/VR_Components/Pop_ups/VR_Start/VR_start_pop-up.uasset b/Content/Blueprints/UI/Imgs/VR_Components/Pop_ups/VR_Start/VR_start_pop-up.uasset new file mode 100644 index 00000000..9867934e Binary files /dev/null and b/Content/Blueprints/UI/Imgs/VR_Components/Pop_ups/VR_Start/VR_start_pop-up.uasset differ diff --git a/Content/Blueprints/UI/Materials/M_flatCap.uasset b/Content/Blueprints/UI/Materials/M_flatCap.uasset index 841a1427..11a0c496 100644 Binary files a/Content/Blueprints/UI/Materials/M_flatCap.uasset and b/Content/Blueprints/UI/Materials/M_flatCap.uasset differ diff --git a/Content/Blueprints/UI/Materials/WidgetMatTrans.uasset b/Content/Blueprints/UI/Materials/WidgetMatTrans.uasset index c9ae4ef7..92496dbc 100644 Binary files a/Content/Blueprints/UI/Materials/WidgetMatTrans.uasset and b/Content/Blueprints/UI/Materials/WidgetMatTrans.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset index d598911e..67f5f0ed 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/SideMenu.uasset b/Content/Blueprints/UI/WBPS/Menu/SideMenu.uasset index f46d41aa..df2020c0 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/SideMenu.uasset and b/Content/Blueprints/UI/WBPS/Menu/SideMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Menu/infraInfo.uasset b/Content/Blueprints/UI/WBPS/Menu/infraInfo.uasset index 532dda50..3e79f626 100644 Binary files a/Content/Blueprints/UI/WBPS/Menu/infraInfo.uasset and b/Content/Blueprints/UI/WBPS/Menu/infraInfo.uasset differ diff --git a/Content/Blueprints/UI/WBPS/VR/VRhelpWindow.uasset b/Content/Blueprints/UI/WBPS/VR/VRhelpWindow.uasset index 571de8c8..10cff8a5 100644 Binary files a/Content/Blueprints/UI/WBPS/VR/VRhelpWindow.uasset and b/Content/Blueprints/UI/WBPS/VR/VRhelpWindow.uasset differ diff --git a/Content/Blueprints/UI/WBPS/VR/VRmainWin.uasset b/Content/Blueprints/UI/WBPS/VR/VRmainWin.uasset index 698f3d89..63ec3ee9 100644 Binary files a/Content/Blueprints/UI/WBPS/VR/VRmainWin.uasset and b/Content/Blueprints/UI/WBPS/VR/VRmainWin.uasset differ diff --git a/Content/Blueprints/Utils/3dNumberSum.uasset b/Content/Blueprints/Utils/3dNumberSum.uasset new file mode 100644 index 00000000..c2e5ed92 Binary files /dev/null and b/Content/Blueprints/Utils/3dNumberSum.uasset differ diff --git a/Content/Blueprints/Utils/Generators/Fonar.uasset b/Content/Blueprints/Utils/Generators/Fonar.uasset new file mode 100644 index 00000000..7c9704dc Binary files /dev/null and b/Content/Blueprints/Utils/Generators/Fonar.uasset differ diff --git a/Content/Blueprints/Utils/Generators/appleSpawner.uasset b/Content/Blueprints/Utils/Generators/appleSpawner.uasset new file mode 100644 index 00000000..2abbb808 Binary files /dev/null and b/Content/Blueprints/Utils/Generators/appleSpawner.uasset differ diff --git a/Content/Blueprints/Utils/Generators/floorCap.uasset b/Content/Blueprints/Utils/Generators/floorCap.uasset index e45eed56..99e93bed 100644 Binary files a/Content/Blueprints/Utils/Generators/floorCap.uasset and b/Content/Blueprints/Utils/Generators/floorCap.uasset differ diff --git a/Content/Maps/Buildings_Outside_p1.umap b/Content/Maps/Buildings_Outside_p1.umap index ba4c81cc..4a621eb4 100644 Binary files a/Content/Maps/Buildings_Outside_p1.umap and b/Content/Maps/Buildings_Outside_p1.umap differ diff --git a/Content/Maps/Buildings_Outside_p3.umap b/Content/Maps/Buildings_Outside_p3.umap index 1b7201bc..877a79a8 100644 Binary files a/Content/Maps/Buildings_Outside_p3.umap and b/Content/Maps/Buildings_Outside_p3.umap differ diff --git a/Content/Maps/DayLight.umap b/Content/Maps/DayLight.umap index 8205d1e3..2b3fe2cb 100644 Binary files a/Content/Maps/DayLight.umap and b/Content/Maps/DayLight.umap differ diff --git a/Content/Maps/Landscape_textures.umap b/Content/Maps/Landscape_textures.umap index 9a76a15a..7c60c853 100644 Binary files a/Content/Maps/Landscape_textures.umap and b/Content/Maps/Landscape_textures.umap differ diff --git a/Content/Maps/MAF_Yard.umap b/Content/Maps/MAF_Yard.umap index a16bb0a1..883898de 100644 Binary files a/Content/Maps/MAF_Yard.umap and b/Content/Maps/MAF_Yard.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 39b2586b..f1ad1c8b 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/NightLight.umap b/Content/Maps/NightLight.umap index 3dd0e873..c0effd13 100644 Binary files a/Content/Maps/NightLight.umap and b/Content/Maps/NightLight.umap differ diff --git a/Content/Maps/Yard.umap b/Content/Maps/Yard.umap index cf9527b7..8d62faa1 100644 Binary files a/Content/Maps/Yard.umap and b/Content/Maps/Yard.umap differ diff --git a/Content/Materials/Chrome.uasset b/Content/Materials/Chrome.uasset index 3cbd9d2c..6c83a088 100644 Binary files a/Content/Materials/Chrome.uasset and b/Content/Materials/Chrome.uasset differ diff --git a/Content/Materials/Chrome_Stones.uasset b/Content/Materials/Chrome_Stones.uasset new file mode 100644 index 00000000..5cd987cd Binary files /dev/null and b/Content/Materials/Chrome_Stones.uasset differ diff --git a/Content/Materials/M_cap.uasset b/Content/Materials/M_cap.uasset index 104b1fba..4aee9472 100644 Binary files a/Content/Materials/M_cap.uasset and b/Content/Materials/M_cap.uasset differ diff --git a/Content/Mavis/Materials/Master/M_Master_ORM.uasset b/Content/Mavis/Materials/Master/M_Master_ORM.uasset index 420ee5a0..27348ed6 100644 Binary files a/Content/Mavis/Materials/Master/M_Master_ORM.uasset and b/Content/Mavis/Materials/Master/M_Master_ORM.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_1.uasset index 15358fd9..116fb17e 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_2.uasset index 3d4b2a5b..36bc97a9 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_3.uasset index 236994bd..eccaa0de 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S1_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_1.uasset index bb69c340..457d6263 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_2.uasset index 3774abdb..9cd3fd0e 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S2_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_1.uasset index 34475c2b..ae9b241f 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_2.uasset index 07918c47..13a617d6 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_3.uasset index fb0f202e..60e79697 100644 Binary files a/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K1/SM_K1_S3_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_1.uasset index 757640e4..bd91ba58 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_2.uasset index c65b3cdd..8d5a3022 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_3.uasset index b774c626..d3f3388c 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K1_S4_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_1.uasset index 69bcc801..4ef2633b 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_2.uasset index 836e2c11..e110cee0 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_3.uasset index e30afedd..cad8d264 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S1_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_1.uasset index ee34b964..1b1f51c8 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_2.uasset index 7e9fd36d..21f51540 100644 Binary files a/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K2/SM_K2_S2_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_1.uasset index 5e899f82..0d269b89 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_2.uasset index cc39b4b8..af895159 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_3.uasset index 18d02043..5a5b00d9 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S1_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_1.uasset index 35c17128..7df50f05 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_2.uasset index b8ad1e7c..40e4c7e3 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S2_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_1.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_1.uasset index c5b41ea9..2680819c 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_1.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_2.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_2.uasset index 3c4a721a..3654cc89 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_2.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_3.uasset b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_3.uasset index 5fcdf145..7d5b673a 100644 Binary files a/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_3.uasset and b/Content/Mavis/Meshes/Exterior/K3/SM_K3_S3_windows_3.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Blue/SM_Playground_House_blue.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Blue/SM_Playground_House_blue.uasset index c3cb7885..ac1bf77f 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Blue/SM_Playground_House_blue.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Blue/SM_Playground_House_blue.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Orange/SM_Playground_House_orange.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Orange/SM_Playground_House_orange.uasset index 112e358b..fc14140c 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Orange/SM_Playground_House_orange.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Orange/SM_Playground_House_orange.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Yellow/SM_Playground_Yellow_House.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Yellow/SM_Playground_Yellow_House.uasset index bfbb172a..87017ebd 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Yellow/SM_Playground_Yellow_House.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/Playground_houses/House_Yellow/SM_Playground_Yellow_House.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/MI_LampStreet_Bars_ORM.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/MI_LampStreet_Bars_ORM.uasset index c08e2124..cb0b9580 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/MI_LampStreet_Bars_ORM.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/MI_LampStreet_Bars_ORM.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_LampSmoll.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_LampSmoll.uasset new file mode 100644 index 00000000..dfdece51 Binary files /dev/null and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_LampSmoll.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_barsSquare.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_barsSquare.uasset new file mode 100644 index 00000000..97189f26 Binary files /dev/null and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_barsSquare.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_lamp_big.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_lamp_big.uasset new file mode 100644 index 00000000..accc8533 Binary files /dev/null and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_lamp_big.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_wire.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_wire.uasset new file mode 100644 index 00000000..40245711 Binary files /dev/null and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/NewFolder/lampStreet_Bars_wire.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_LampStreet_Bars.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_LampStreet_Bars.uasset index 17f5f20e..d05c1efd 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_LampStreet_Bars.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_LampStreet_Bars.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_LampSmoll.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_LampSmoll.uasset index a9ca5744..1963d1be 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_LampSmoll.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_LampSmoll.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_lamp_big.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_lamp_big.uasset index cefa68d1..1c48c834 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_lamp_big.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_lamp_big.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_wire.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_wire.uasset index 731cbbf0..6b91c69e 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_wire.uasset and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/SM_lampStreet_Bars_wire.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/T_lampStreet_Bars_Emissive.uasset b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/T_lampStreet_Bars_Emissive.uasset new file mode 100644 index 00000000..9729b184 Binary files /dev/null and b/Content/Mavis/Meshes/Exterior/MAF/ChildSquare/lampStreet_Bars/T_lampStreet_Bars_Emissive.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/Oct/SM_grooves.uasset b/Content/Mavis/Meshes/Exterior/MAF/Oct/SM_grooves.uasset index e9a87e8c..6b475ead 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/Oct/SM_grooves.uasset and b/Content/Mavis/Meshes/Exterior/MAF/Oct/SM_grooves.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/MAF/Swings/SM_Swings_1.uasset b/Content/Mavis/Meshes/Exterior/MAF/Swings/SM_Swings_1.uasset index 61b5b885..3ef90a52 100644 Binary files a/Content/Mavis/Meshes/Exterior/MAF/Swings/SM_Swings_1.uasset and b/Content/Mavis/Meshes/Exterior/MAF/Swings/SM_Swings_1.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator.uasset b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator.uasset index f2c42bc6..36602394 100644 Binary files a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator.uasset and b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator_2.uasset b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator_2.uasset index 167dd236..999dd93f 100644 Binary files a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator_2.uasset and b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Transformator_2.uasset differ diff --git a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Trash_2.uasset b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Trash_2.uasset index 6eaefce6..9b8b1ae0 100644 Binary files a/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Trash_2.uasset and b/Content/Mavis/Meshes/Exterior/OutsideBuildings/SM_Trash_2.uasset differ diff --git a/Content/Meshes/Yard/SM_Plane.uasset b/Content/Meshes/Yard/SM_Plane.uasset index 9a4809e9..b7d4aabf 100644 Binary files a/Content/Meshes/Yard/SM_Plane.uasset and b/Content/Meshes/Yard/SM_Plane.uasset differ diff --git a/Content/Sequences/tour.uasset b/Content/Sequences/tour.uasset new file mode 100644 index 00000000..8166b3d1 Binary files /dev/null and b/Content/Sequences/tour.uasset differ diff --git a/piterGraphicsC.uproject b/piterGraphicsC.uproject index 3fd69bb5..38236b05 100644 --- a/piterGraphicsC.uproject +++ b/piterGraphicsC.uproject @@ -230,12 +230,13 @@ "MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/1bf89025ddf246e3af3c196d0426e0d3" }, { - "Name": "OculusVR", + "Name": "SteamVR", "Enabled": false, "SupportedTargetPlatforms": [ "Win32", "Win64", - "Android" + "Linux", + "Mac" ] } ]