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

# Conflicts:
#	Content/Level/Lights.umap
#	Content/Level/S2F1.umap

Config/DefaultEngine.ini

@@ -10,6 +10,20 @@ AppliedTargetedHardwareClass=Desktop
 DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum
 
+[/Script/WindowsTargetPlatform.WindowsTargetSettings]
+DefaultGraphicsRHI=DefaultGraphicsRHI_DX12
+
+[/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)
+
+[/Script/Engine.Engine]
+NearClipPlane=1.000000
+
+[/Script/EngineSettings.GameMapsSettings]
+EditorStartupMap=/Game/Level/Index.Index
+GameDefaultMap=/Game/Level/Index.Index
+GlobalDefaultGameMode=/Game/Blueprints/Player/MyGM.MyGM_C
+
 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000
 DefaultTerminalVelocity=4000.000000