Merge branch 'master' of http://192.168.1.163:3000/Dron/UralskyExtDemo

# Conflicts: # Content/Instances/Glaas/MI_Glass_Win_2.uasset # Content/Level/GenPlan.umap # Content/Level/Index.umap
2020-07-10 19:23:57 +05:00
parent 6e1e7aefcc 44d945c31a
commit 53123d6cab
70 changed files with 2 additions and 0 deletions
@@ -49,6 +49,7 @@ UIScaleCurve=(EditorCurveData=(Keys=((Time=540.000000,Value=0.250000),(Time=1080
 [/Script/Engine.Engine]
 NearClipPlane=1.000000
 bSmoothFrameRate=False
+MaximumLoopIterationCount=10000000

 [/Script/EngineSettings.GameMapsSettings]
 EditorStartupMap=/Game/Level/Index.Index
@@ -72,6 +73,7 @@ s.AsyncLoadingThreadEnabled=True
 s.LevelStreamingComponentsRegistrationGranularity=10
 s.LevelStreamingComponentsUnregistrationGranularity=5
 s.FlushStreamingOnExit=False
+s.UseBackgroundLevelStreaming=False

 [/Script/NavigationSystem.NavigationSystemV1]
 CrowdManagerClass=/Script/AIModule.CrowdManager