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

# Conflicts: # Content/Maps/Interior/A1T/A1T_L.umap
2022-10-31 14:31:46 +05:00
parent dcac2215ed 04fa78ebdb
commit 7c8f23563a
27 changed files with 2 additions and 0 deletions
@@ -17,6 +17,8 @@ r.DefaultFeature.AntiAliasing=1
 [/Script/EngineSettings.GameMapsSettings]
 GlobalDefaultGameMode=/Game/Blueprints/Player/myGM.myGM_C
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
+EditorStartupMap=/Game/Maps/Main.Main
+GameDefaultMap=/Game/Maps/Main.Main

 [/Script/Engine.StreamingSettings]
 s.AsyncLoadingTimeLimit=2.000000