diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index f8551e93..41931748 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -2,7 +2,7 @@ [/Script/Engine.RendererSettings] r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True r.SkinCache.CompileShaders=True -r.RayTracing=True +r.RayTracing=False r.ReflectionCaptureResolution=256 r.GenerateMeshDistanceFields=False r.DefaultFeature.LensFlare=True @@ -24,6 +24,7 @@ r.EarlyZPassOnlyMaterialMasking=False r.GBufferFormat=0 r.DefaultFeature.MotionBlur=False r.ClearSceneMethod=0 +r.AllowGlobalClipPlane=True [/Script/HardwareTargeting.HardwareTargetingSettings] TargetedHardwareClass=Desktop @@ -32,7 +33,7 @@ DefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum [/Script/WindowsTargetPlatform.WindowsTargetSettings] -DefaultGraphicsRHI=DefaultGraphicsRHI_DX11 +DefaultGraphicsRHI=DefaultGraphicsRHI_DX12 Compiler=VisualStudio2017 OcclusionPlugin=Built-in Occlusion ReverbPlugin=Built-in Reverb diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 32b4ce9c..5890c304 100644 Binary files a/Config/DefaultGame.ini and b/Config/DefaultGame.ini differ diff --git a/Config/steamvr_ue_editor_app.json b/Config/steamvr_ue_editor_app.json index fdfb4500..200e8f91 100644 --- a/Config/steamvr_ue_editor_app.json +++ b/Config/steamvr_ue_editor_app.json @@ -2,7 +2,7 @@ "source": "UE", "applications": [ { - "app_key": "application.generated.ue.ЖК-Уральский-10757647.ue4editor.exe", + "app_key": "application.generated.ue.ЖК-Уральский-11100242.ue4editor.exe", "launch_type": "url", "url": "steam://launch/", "action_manifest_path": "C:/Projects/Uralsky/Config/SteamVRBindings/steamvr_manifest.json", @@ -10,7 +10,7 @@ { "en_us": { - "name": "ЖК Уральский-10757647 [UE Editor]" + "name": "ЖК Уральский-11100242 [UE Editor]" } } } diff --git a/Content/AssetPacks/Car/BP_CarSpline.uasset b/Content/AssetPacks/Car/BP_CarSpline.uasset index 195c2ba8..a70664bf 100644 Binary files a/Content/AssetPacks/Car/BP_CarSpline.uasset and b/Content/AssetPacks/Car/BP_CarSpline.uasset differ diff --git a/Content/AssetPacks/Maf/Materials/M_Grid.uasset b/Content/AssetPacks/Maf/Materials/M_Grid.uasset index 45a5835e..d5cf044c 100644 Binary files a/Content/AssetPacks/Maf/Materials/M_Grid.uasset and b/Content/AssetPacks/Maf/Materials/M_Grid.uasset differ diff --git a/Content/AssetPacks/Maf/Textures/Grid_O.uasset b/Content/AssetPacks/Maf/Textures/Grid_O.uasset index f4fa1659..d20a2735 100644 Binary files a/Content/AssetPacks/Maf/Textures/Grid_O.uasset and b/Content/AssetPacks/Maf/Textures/Grid_O.uasset differ diff --git a/Content/AssetPacks/TreePackMaple/Materials/MapleTree/M_CustomDepthBillboard_2.uasset b/Content/AssetPacks/TreePackMaple/Materials/MapleTree/M_CustomDepthBillboard_2.uasset index d68b951d..c0ca11ff 100644 Binary files a/Content/AssetPacks/TreePackMaple/Materials/MapleTree/M_CustomDepthBillboard_2.uasset and b/Content/AssetPacks/TreePackMaple/Materials/MapleTree/M_CustomDepthBillboard_2.uasset differ diff --git a/Content/AssetPacks/TreePackMaple/Materials/MapleTree/T_mapleTree_A_normal_lod3.uasset b/Content/AssetPacks/TreePackMaple/Materials/MapleTree/T_mapleTree_A_normal_lod3.uasset index a288282a..5fbf3192 100644 Binary files a/Content/AssetPacks/TreePackMaple/Materials/MapleTree/T_mapleTree_A_normal_lod3.uasset and b/Content/AssetPacks/TreePackMaple/Materials/MapleTree/T_mapleTree_A_normal_lod3.uasset differ diff --git a/Content/AssetPacks/dViz_Plant_Pack/Material/Base_Material/M_dvizPlantPack_Brushed_Steel.uasset b/Content/AssetPacks/dViz_Plant_Pack/Material/Base_Material/M_dvizPlantPack_Brushed_Steel.uasset index e54ccafc..5eeaae52 100644 Binary files a/Content/AssetPacks/dViz_Plant_Pack/Material/Base_Material/M_dvizPlantPack_Brushed_Steel.uasset and b/Content/AssetPacks/dViz_Plant_Pack/Material/Base_Material/M_dvizPlantPack_Brushed_Steel.uasset differ diff --git a/Content/AssetPacks/dViz_Plant_Pack/Textures/2k/T_dvizPlantPack_Brushed_Steel_N.uasset b/Content/AssetPacks/dViz_Plant_Pack/Textures/2k/T_dvizPlantPack_Brushed_Steel_N.uasset index a859b9c0..72b8ba7c 100644 Binary files a/Content/AssetPacks/dViz_Plant_Pack/Textures/2k/T_dvizPlantPack_Brushed_Steel_N.uasset and b/Content/AssetPacks/dViz_Plant_Pack/Textures/2k/T_dvizPlantPack_Brushed_Steel_N.uasset differ diff --git a/Content/AssetPacks/wardrobe/mesh253.uasset b/Content/AssetPacks/wardrobe/mesh253.uasset index 3d7692ed..14bd6f73 100644 Binary files a/Content/AssetPacks/wardrobe/mesh253.uasset and b/Content/AssetPacks/wardrobe/mesh253.uasset differ diff --git a/Content/Blueprints/BP_Elevator_OTIS.uasset b/Content/Blueprints/BP_Elevator_OTIS.uasset index 5273241a..57dc7a2f 100644 Binary files a/Content/Blueprints/BP_Elevator_OTIS.uasset and b/Content/Blueprints/BP_Elevator_OTIS.uasset differ diff --git a/Content/Blueprints/Player/GI.uasset b/Content/Blueprints/Player/GI.uasset index eb8ee640..e79f62b3 100644 Binary files a/Content/Blueprints/Player/GI.uasset and b/Content/Blueprints/Player/GI.uasset differ diff --git a/Content/Blueprints/Player/GIEventFunc.uasset b/Content/Blueprints/Player/GIEventFunc.uasset index a3e707bc..9667f565 100644 Binary files a/Content/Blueprints/Player/GIEventFunc.uasset and b/Content/Blueprints/Player/GIEventFunc.uasset differ diff --git a/Content/Blueprints/Player/Levels.uasset b/Content/Blueprints/Player/Levels.uasset index 70b55667..0295ec4e 100644 Binary files a/Content/Blueprints/Player/Levels.uasset and b/Content/Blueprints/Player/Levels.uasset differ diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index 877c1f78..3c10b596 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/VR/BP_MotionController.uasset b/Content/Blueprints/Player/VR/BP_MotionController.uasset index 9a977f99..bcf570c3 100644 Binary files a/Content/Blueprints/Player/VR/BP_MotionController.uasset and b/Content/Blueprints/Player/VR/BP_MotionController.uasset differ diff --git a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset index f3fb901e..aa3d2057 100644 Binary files a/Content/Blueprints/Player/VR/MotionControllerPawn.uasset and b/Content/Blueprints/Player/VR/MotionControllerPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 5b710c8c..2cd9c950 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/UI/456.uasset b/Content/Blueprints/UI/456.uasset deleted file mode 100644 index 71191cec..00000000 Binary files a/Content/Blueprints/UI/456.uasset and /dev/null differ diff --git a/Content/Blueprints/UI/Other/Btns.uasset b/Content/Blueprints/UI/Other/Btns.uasset index 1670a5ee..708151d8 100644 Binary files a/Content/Blueprints/UI/Other/Btns.uasset and b/Content/Blueprints/UI/Other/Btns.uasset differ diff --git a/Content/Blueprints/UI/Other/FlatMap.uasset b/Content/Blueprints/UI/Other/FlatMap.uasset index e0d585dd..4178ceb4 100644 Binary files a/Content/Blueprints/UI/Other/FlatMap.uasset and b/Content/Blueprints/UI/Other/FlatMap.uasset differ diff --git a/Content/Blueprints/UI/Other/FlatPoint.uasset b/Content/Blueprints/UI/Other/FlatPoint.uasset index f8496b50..00199f06 100644 Binary files a/Content/Blueprints/UI/Other/FlatPoint.uasset and b/Content/Blueprints/UI/Other/FlatPoint.uasset differ diff --git a/Content/Blueprints/UI/Other/FloorTablo.uasset b/Content/Blueprints/UI/Other/FloorTablo.uasset index 3a428c1c..fccd6aed 100644 Binary files a/Content/Blueprints/UI/Other/FloorTablo.uasset and b/Content/Blueprints/UI/Other/FloorTablo.uasset differ diff --git a/Content/Blueprints/UI/Other/Pointer1.uasset b/Content/Blueprints/UI/Other/Pointer1.uasset index 3068be2d..4b5fd097 100644 Binary files a/Content/Blueprints/UI/Other/Pointer1.uasset and b/Content/Blueprints/UI/Other/Pointer1.uasset differ diff --git a/Content/Blueprints/UI/Other/StageSelect.uasset b/Content/Blueprints/UI/Other/StageSelect.uasset index 7c41a2c0..da947dbd 100644 Binary files a/Content/Blueprints/UI/Other/StageSelect.uasset and b/Content/Blueprints/UI/Other/StageSelect.uasset differ diff --git a/Content/Blueprints/UI/Wbps/Button.uasset b/Content/Blueprints/UI/Wbps/Button.uasset index 0de0f424..174a22ba 100644 Binary files a/Content/Blueprints/UI/Wbps/Button.uasset and b/Content/Blueprints/UI/Wbps/Button.uasset differ diff --git a/Content/Blueprints/UI/Wbps/Ipad/IpadScreen.uasset b/Content/Blueprints/UI/Wbps/Ipad/IpadScreen.uasset index 805c8a50..5e4374af 100644 Binary files a/Content/Blueprints/UI/Wbps/Ipad/IpadScreen.uasset and b/Content/Blueprints/UI/Wbps/Ipad/IpadScreen.uasset differ diff --git a/Content/Blueprints/UI/Wbps/Loading.uasset b/Content/Blueprints/UI/Wbps/Loading.uasset index 1c6aaeca..5cd07efd 100644 Binary files a/Content/Blueprints/UI/Wbps/Loading.uasset and b/Content/Blueprints/UI/Wbps/Loading.uasset differ diff --git a/Content/Blueprints/UI/Wbps/Menu.uasset b/Content/Blueprints/UI/Wbps/Menu.uasset index 99d63fd4..4639d191 100644 Binary files a/Content/Blueprints/UI/Wbps/Menu.uasset and b/Content/Blueprints/UI/Wbps/Menu.uasset differ diff --git a/Content/Blueprints/UI/Wbps/Pointer.uasset b/Content/Blueprints/UI/Wbps/Pointer.uasset index 9cf9a8c1..defa3fc2 100644 Binary files a/Content/Blueprints/UI/Wbps/Pointer.uasset and b/Content/Blueprints/UI/Wbps/Pointer.uasset differ diff --git a/Content/Blueprints/UI/Wbps/PointerMop.uasset b/Content/Blueprints/UI/Wbps/PointerMop.uasset index e5c98bb6..0afba946 100644 Binary files a/Content/Blueprints/UI/Wbps/PointerMop.uasset and b/Content/Blueprints/UI/Wbps/PointerMop.uasset differ diff --git a/Content/Level/GenPlan.umap b/Content/Level/GenPlan.umap index 8303022c..0b8256b9 100644 Binary files a/Content/Level/GenPlan.umap and b/Content/Level/GenPlan.umap differ diff --git a/Content/Level/Genplan2.umap b/Content/Level/Genplan2.umap index 9f3e34a5..c5c2939e 100644 Binary files a/Content/Level/Genplan2.umap and b/Content/Level/Genplan2.umap differ diff --git a/Content/Level/Index.umap b/Content/Level/Index.umap index 25d69fbb..6f6e613f 100644 Binary files a/Content/Level/Index.umap and b/Content/Level/Index.umap differ diff --git a/Content/Level/Lift.umap b/Content/Level/Lift.umap index 95004da8..96f91c08 100644 Binary files a/Content/Level/Lift.umap and b/Content/Level/Lift.umap differ diff --git a/Content/Level/New_S2F1/S2F1.umap b/Content/Level/New_S2F1/S2F1.umap index 34b07296..210740dd 100644 Binary files a/Content/Level/New_S2F1/S2F1.umap and b/Content/Level/New_S2F1/S2F1.umap differ diff --git a/Content/Level/New_S2F2/S2F2.umap b/Content/Level/New_S2F2/S2F2.umap index 198dc4c0..5c7ccd40 100644 Binary files a/Content/Level/New_S2F2/S2F2.umap and b/Content/Level/New_S2F2/S2F2.umap differ diff --git a/Content/Level/New_S2F21/S2F21F5.umap b/Content/Level/New_S2F21/S2F21F5.umap index 09f3d25f..526f118e 100644 Binary files a/Content/Level/New_S2F21/S2F21F5.umap and b/Content/Level/New_S2F21/S2F21F5.umap differ diff --git a/Content/Level/New_S3F1/S3F1.umap b/Content/Level/New_S3F1/S3F1.umap index a37d1f45..27790121 100644 Binary files a/Content/Level/New_S3F1/S3F1.umap and b/Content/Level/New_S3F1/S3F1.umap differ diff --git a/Content/Level/New_S3F2/S3F2.umap b/Content/Level/New_S3F2/S3F2.umap index 7818b333..8b2bfcfa 100644 Binary files a/Content/Level/New_S3F2/S3F2.umap and b/Content/Level/New_S3F2/S3F2.umap differ