Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer

# Conflicts: # .gitignore # Content/Maps/Underground_parking_GP4.umap # Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset
2022-03-01 13:56:39 +05:00
parent 5d643ab427 5715cc3f0d
commit 5ad444850b
18 changed files with 1 additions and 2 deletions
@@ -1,4 +1,3 @@
 Binaries
 DerivedDataCache
 Intermediate
@@ -14,4 +13,4 @@ Saved
 *.xcodeproj
 *.xcworkspace
 !plugins/**
-Build
+*.BuiltData.uasset