Merge branch 'developer'

# Conflicts: # Content/Maps/Interior/GP2/S02F01.umap
2022-08-29 23:19:51 +05:00
parent 0ef3256d30 2489392f03
commit d60fc65f6b
35 changed files with 2 additions and 1 deletions
@@ -15,6 +15,7 @@ AppliedDefaultGraphicsPerformance=Maximum
 [/Script/Engine.Engine]
 +ActiveGameNameRedirects=(OldGameName="TP_BlankBP",NewGameName="/Script/Masharov")
 +ActiveGameNameRedirects=(OldGameName="/Script/TP_BlankBP",NewGameName="/Script/Masharov")
+MaximumLoopIterationCount=2000000

 [/Script/Engine.RendererSettings]
 r.SkinCache.CompileShaders=True
@@ -77,7 +78,7 @@ r.FidelityFX.FSR2.UseNativeDX12=True
 r.FidelityFX.FSR2.UseNativeVulkan=True

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

 [/Script/Engine.CollisionProfile]
 -Profiles=(Name="NoCollision",CollisionEnabled=NoCollision,ObjectTypeName="WorldStatic",CustomResponses=((Channel="Visibility",Response=ECR_Ignore),(Channel="Camera",Response=ECR_Ignore)),HelpMessage="No collision",bCanModify=False)