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

# Conflicts: # Content/Level/S2F1.umap # Content/Level/S2F1/S2F1.umap
2019-11-25 17:25:54 +05:00
parent 7edb641e0d e035ff6619
commit e2dc1e36ba
132 changed files with 1 additions and 1 deletions
@@ -21,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=CurveFloat'"/Game/Blueprints/UI/456.456"')
+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/123.123"')

 [/Script/Engine.Engine]
 NearClipPlane=1.000000
--- a/Show More
+++ b/Show More