Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

# Conflicts: # Content/Level/Lights.umap
2019-11-22 14:35:20 +05:00
parent cc80a0f43b 417f08e1ef
commit 5c4538cbcb
74 changed files with 3 additions and 1 deletions
@@ -7,6 +7,8 @@ r.ReflectionCaptureResolution=128
 r.GenerateMeshDistanceFields=False
 r.DefaultFeature.LensFlare=True
 r.Shadow.UnbuiltPreviewInGame=False
+r.SeparateTranslucency=False
+r.TranslucentSortPolicy=0

 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -19,7 +21,7 @@ DefaultGraphicsRHI=DefaultGraphicsRHI_DX11
 Compiler=VisualStudio2017

 [/Script/Engine.UserInterfaceSettings]
-UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000)),PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=None)
+UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000)),PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=CurveFloat'"/Game/Blueprints/UI/456.456"')

 [/Script/Engine.Engine]
 NearClipPlane=1.000000