Manual diff merge from FF/Development

Hopefully cleans up the mess now.
This commit is contained in:
Frank
2018-12-09 19:11:46 +01:00
parent 8d222fd0c3
commit afb0a8af33
15 changed files with 7307 additions and 1234 deletions

View File

@@ -59,12 +59,21 @@ Functional/Suppression.lua
Functional/PseudoATC.lua
Functional/Warehouse.lua
Ops/Airboss.lua
Ops/RecoveryTanker.lua
Ops/RescueHelo.lua
AI/AI_Balancer.lua
AI/AI_Air.lua
AI/AI_A2A.lua
AI/AI_A2A_Patrol.lua
AI/AI_A2A_Cap.lua
AI/AI_A2A_Gci.lua
AI/AI_A2A_Dispatcher.lua
AI/AI_A2G.lua
AI/AI_A2G_Engage.lua
AI/AI_A2G_Patrol.lua
AI/AI_A2G_Dispatcher.lua
AI/AI_Patrol.lua
AI/AI_Cap.lua
AI/AI_Cas.lua