Merge remote-tracking branch 'origin/master' into Danis

# Conflicts: # Content/Maps/MainScene.umap
2021-01-26 12:49:19 +05:00
parent 5cbf897c09 3530528888
commit 1a02f5e752
303 changed files with 37 additions and 2 deletions
@@ -1,3 +1,4 @@
+Build
 Binaries
 DerivedDataCache
 Intermediate
@@ -21,3 +22,4 @@ Content/Blueprints/UI/Imgs/shit/screen*
 =======
 *BuiltData.uasset
 >>>>>>> 75122678f025a258a283030fe5cab391858f2e60
+Temp
@@ -30,7 +30,6 @@ r.SeparateTranslucency=False
 [/Script/EngineSettings.GameMapsSettings]
 GameInstanceClass=/Game/Blueprints/Player/GI.GI_C
 GlobalDefaultGameMode=/Game/Blueprints/Player/MyGM.MyGM_C
-EditorStartupMap=/Game/Maps/MainScene.MainScene
 GameDefaultMap=/Game/Maps/MainScene.MainScene

 [/Script/Engine.UserInterfaceSettings]
--- a/Show More
+++ b/Show More