Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis

# Conflicts: # Content/Taktika/Maps/Interior/TKT_S01F02-05_Interior.umap # Content/Taktika/Maps/Interior/TKT_S01F06_Interior.umap # Content/Taktika/Maps/Interior/TKT_S01F07-21_Interior.umap # Content/Taktika/Maps/Interior/TKT_S02F02-05_Interior.umap # Content/Taktika/Maps/Interior/TKT_S02F06_Interior.umap # Content/Taktika/Maps/Interior/TKT_S02F07-16_Interior.umap
2024-12-23 21:52:44 +05:00
parent 1358d017f6 6e15c2f3eb
commit 7cedb2822f
35 changed files with 12 additions and 1 deletions
@@ -2,4 +2,11 @@
 2626528:2
 2626543:3
 3112699:2
-2626545:4
+2626545:4
+3112700:2
+3112690:1
+3112699:3
+3112701:4
+2791065:1
+2801661:1
+2802194:1
@@ -362,6 +362,10 @@
 				"Linux",
 				"Android"
 			]
+		},
+		{
+			"Name": "UdpMessaging",
+			"Enabled": false
 		}
 	]
 }