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

# Conflicts: # Content/Level/S2F1.umap
2019-10-23 13:11:26 +05:00
parent 1e9d53980b 0f90e4ed71
commit 5410ae2e6f
69 changed files with 1 additions and 1 deletions
@@ -11,7 +11,7 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum

 [/Script/WindowsTargetPlatform.WindowsTargetSettings]
-DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
+DefaultGraphicsRHI=DefaultGraphicsRHI_DX11

 [/Script/Engine.UserInterfaceSettings]
 UIScaleCurve=(EditorCurveData=(Keys=((Time=720.000000,Value=0.400000),(Time=1080.000000,Value=0.500000),(Time=2160.000000,Value=1.000000)),PreInfinityExtrap=RCCE_Constant,PostInfinityExtrap=RCCE_Constant,DefaultValue=340282346638528859811704183484516925440.000000),ExternalCurve=None)