Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain

1 year ago · 4bc82eb26f
parent 7e652148a4 b670e67076
commit 4bc82eb26f
40 changed files with 87 additions and 63 deletions
--- a/Japan_Raid/Config/DefaultEngine.ini
+++ b/Japan_Raid/Config/DefaultEngine.ini
@ -42,8 +42,8 @@ AppliedDefaultGraphicsPerformance=Maximum

 [/Script/Engine.RendererSettings]
 r.GenerateMeshDistanceFields=True
-r.DynamicGlobalIlluminationMethod=1
-r.ReflectionMethod=1
+r.DynamicGlobalIlluminationMethod=0
+r.ReflectionMethod=0
 r.Shadow.Virtual.Enable=1
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
 r.SkinCache.CompileShaders=True
--- a/Japan_Raid/Content/HDRI/NewTextureRenderTargetCube_Tex.uasset
+++ b/Japan_Raid/Content/HDRI/NewTextureRenderTargetCube_Tex.uasset
--- a/Japan_Raid/Content/HDRI/Sphere1.uasset
+++ b/Japan_Raid/Content/HDRI/Sphere1.uasset
--- a/Japan_Raid/Content/HDRI/belfast_sunset_puresky_8k.uasset
+++ b/Japan_Raid/Content/HDRI/belfast_sunset_puresky_8k.uasset
--- a/Japan_Raid/Content/HDRI/industrial_sunset_puresky_8k.uasset
+++ b/Japan_Raid/Content/HDRI/industrial_sunset_puresky_8k.uasset
--- a/Japan_Raid/Content/HDRI/kloppenheim_06_puresky_8k.uasset
+++ b/Japan_Raid/Content/HDRI/kloppenheim_06_puresky_8k.uasset
--- a/Japan_Raid/Content/HDRI/kloppenheim_07_puresky_8k.uasset
+++ b/Japan_Raid/Content/HDRI/kloppenheim_07_puresky_8k.uasset
--- a/Japan_Raid/Content/Levels/Fog.umap
+++ b/Japan_Raid/Content/Levels/Fog.umap
--- a/Japan_Raid/Content/Levels/Geometry.umap
+++ b/Japan_Raid/Content/Levels/Geometry.umap
--- a/Japan_Raid/Content/Levels/Light_day.umap
+++ b/Japan_Raid/Content/Levels/Light_day.umap
--- a/Japan_Raid/Content/Levels/Light_day_HDRI.umap
+++ b/Japan_Raid/Content/Levels/Light_day_HDRI.umap
--- a/Japan_Raid/Content/Levels/Light_night.umap
+++ b/Japan_Raid/Content/Levels/Light_night.umap
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
--- a/Japan_Raid/Content/Material/Environment/M_Wood_Walnut.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_Wood_Walnut.uasset
--- a/Japan_Raid/Content/Material/Environment/M_Wood_Walnut1.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_Wood_Walnut1.uasset
--- a/Japan_Raid/Content/Material/Foliage/MI_Bamboo_Bark.uasset
+++ b/Japan_Raid/Content/Material/Foliage/MI_Bamboo_Bark.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_Bark.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_Bark.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_Branch.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_Branch.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_Leaf01.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_Leaf01.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_Leaf02.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_Leaf02.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_v1_Leaf01.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_v1_Leaf01.uasset
--- a/Japan_Raid/Content/Material/Foliage/M_Bamboo_v1_Leaf02.uasset
+++ b/Japan_Raid/Content/Material/Foliage/M_Bamboo_v1_Leaf02.uasset
--- a/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst1.uasset
+++ b/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst1.uasset
--- a/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst2.uasset
+++ b/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst2.uasset
--- a/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst4.uasset
+++ b/Japan_Raid/Content/Material/M_Volumetrik_Fog_Inst4.uasset
--- a/Japan_Raid/Content/Material/Megascans/Surfaces/Scratched_Painted_Steel_sefndiic/MI_Scratched_Painted_Steel_sefndiic_1K.uasset
+++ b/Japan_Raid/Content/Material/Megascans/Surfaces/Scratched_Painted_Steel_sefndiic/MI_Scratched_Painted_Steel_sefndiic_1K.uasset
--- a/Japan_Raid/Content/Material/Megascans/Surfaces/Scratched_Painted_Steel_sefndiic/T_Scratched_Painted_Steel_sefndiic_1K_M.uasset
+++ b/Japan_Raid/Content/Material/Megascans/Surfaces/Scratched_Painted_Steel_sefndiic/T_Scratched_Painted_Steel_sefndiic_1K_M.uasset
--- a/Japan_Raid/Content/Material/Textures/New_Graph_metallic.uasset
+++ b/Japan_Raid/Content/Material/Textures/New_Graph_metallic.uasset
--- a/Japan_Raid/Content/Meshes/Environment/SM_Pavilion.uasset
+++ b/Japan_Raid/Content/Meshes/Environment/SM_Pavilion.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/F_Bamboo_v3.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/F_Bamboo_v3.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/F_Bamboo_v5.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/F_Bamboo_v5.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/F_Rhodondendron_v1.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/F_Rhodondendron_v1.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/F_Rhodondendron_v2.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/F_Rhodondendron_v2.uasset
--- a/Japan_Raid/Content/Meshes/Foliage/F_maple_v1.uasset
+++ b/Japan_Raid/Content/Meshes/Foliage/F_maple_v1.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_BambooFence_v1.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_BambooFence_v1.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_BambooFence_v2.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_BambooFence_v2.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v111.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v111.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v2.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v2.uasset
--- a/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v22222.uasset
+++ b/Japan_Raid/Content/Meshes/Props/SM_Shishiodoshi_v22222.uasset
--- a/Japan_Raid/Content/StonePineForest/Materials/MasterMaterials/M_StonePine_Leafs.uasset
+++ b/Japan_Raid/Content/StonePineForest/Materials/MasterMaterials/M_StonePine_Leafs.uasset