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

# Conflicts: # Content/BP_Tools/BP_S1Roof.uasset # Content/BP_Tools/BP_S2F1Exterior.uasset # Content/Meshes/Turn1_Level1/S1_Roof.uasset
2019-02-04 15:05:07 +05:00
parent 0f7c6567b1 7495b78ba6
commit fcd74bf033
33 changed files with 2 additions and 4 deletions
@@ -7,8 +7,8 @@ DefaultGraphicsPerformance=Maximum
 AppliedDefaultGraphicsPerformance=Maximum

 [/Script/EngineSettings.GameMapsSettings]
-EditorStartupMap=/Game/Levels/Turn2_Level1.Turn2_Level1
-GameDefaultMap=/Game/Levels/Turn2_Level1.Turn2_Level1
+EditorStartupMap=/Game/Levels/Environment.Environment
+GameDefaultMap=/Game/Levels/Environment.Environment

 [/Script/Engine.PhysicsSettings]
 DefaultGravityZ=-980.000000
@@ -54,5 +54,3 @@ AsyncSceneSmoothingFactor=0.990000
 InitialAverageFrameRate=0.016667
 PhysXTreeRebuildRate=10
 DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2)
-
-