Merge branch 'master' of http://192.168.1.163:3000/Maxim/COD

# Conflicts: # Config/DefaultEngine.ini
2019-05-22 11:22:23 +05:00
parent 9660082912 2abf0459df
commit 8a5d06bf05
2 changed files with 2 additions and 3 deletions
@@ -1,7 +1,6 @@
 [URL]
 [/Script/Engine.RendererSettings]
 r.DefaultFeature.AutoExposure.ExtendDefaultLuminanceRange=True
-r.ReflectionCaptureResolution=256

 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
@@ -10,8 +9,8 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/Kamaz_01.Kamaz_01
-GameDefaultMap=/Game/Levels/Kamaz_01.Kamaz_01
+EditorStartupMap=/Game/Levels/Container_04A.Container_04A
+GameDefaultMap=/Game/Levels/Container_04A.Container_04A

 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000