Merge remote-tracking branch 'refs/remotes/origin/master' into Release-2.2.0

# Conflicts:
#	Moose Mission Setup/Moose.lua

Moose Mission Setup/Moose_.lua

@@ -0,0 +1,85 @@
+env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
+env.info('Moose Generation Timestamp: 20171003_1348')
+local base=_G
+__Moose={}
+__Moose.Include=function(IncludeFile)
+if not __Moose.Includes[IncludeFile]then
+__Moose.Includes[IncludeFile]=IncludeFile
+local f=assert(base.loadfile(__Moose.ProgramPath..IncludeFile))
+if f==nil then
+error("Moose: Could not load Moose file "..IncludeFile)
+else
+env.info("Moose: "..IncludeFile.." dynamically loaded from "..__Moose.ProgramPath)
+return f()
+end
+end
+end
+__Moose.ProgramPath="Scripts/Moose/"
+__Moose.Includes={}
+__Moose.Include('Utilities/Routines.lua')
+__Moose.Include('Utilities/Utils.lua')
+__Moose.Include('Core/Base.lua')
+__Moose.Include('Core/Report.lua')
+__Moose.Include('Core/Scheduler.lua')
+__Moose.Include('Core/ScheduleDispatcher.lua')
+__Moose.Include('Core/Event.lua')
+__Moose.Include('Core/Settings.lua')
+__Moose.Include('Core/Menu.lua')
+__Moose.Include('Core/Zone.lua')
+__Moose.Include('Core/Database.lua')
+__Moose.Include('Core/Set.lua')
+__Moose.Include('Core/Point.lua')
+__Moose.Include('Core/Message.lua')
+__Moose.Include('Core/Fsm.lua')
+__Moose.Include('Core/Radio.lua')
+__Moose.Include('Core/SpawnStatic.lua')
+__Moose.Include('Core/Cargo.lua')
+__Moose.Include('Core/Spot.lua')
+__Moose.Include('Wrapper/Object.lua')
+__Moose.Include('Wrapper/Identifiable.lua')
+__Moose.Include('Wrapper/Positionable.lua')
+__Moose.Include('Wrapper/Controllable.lua')
+__Moose.Include('Wrapper/Group.lua')
+__Moose.Include('Wrapper/Unit.lua')
+__Moose.Include('Wrapper/Client.lua')
+__Moose.Include('Wrapper/Static.lua')
+__Moose.Include('Wrapper/Airbase.lua')
+__Moose.Include('Wrapper/Scenery.lua')
+__Moose.Include('Functional/Scoring.lua')
+__Moose.Include('Functional/CleanUp.lua')
+__Moose.Include('Functional/Spawn.lua')
+__Moose.Include('Functional/Movement.lua')
+__Moose.Include('Functional/Sead.lua')
+__Moose.Include('Functional/Escort.lua')
+__Moose.Include('Functional/MissileTrainer.lua')
+__Moose.Include('Functional/AirbasePolice.lua')
+__Moose.Include('Functional/Detection.lua')
+__Moose.Include('Functional/Designate.lua')
+__Moose.Include('Functional/RAT.lua')
+__Moose.Include('AI/AI_Balancer.lua')
+__Moose.Include('AI/AI_A2A.lua')
+__Moose.Include('AI/AI_A2A_Patrol.lua')
+__Moose.Include('AI/AI_A2A_Cap.lua')
+__Moose.Include('AI/AI_A2A_Gci.lua')
+__Moose.Include('AI/AI_A2A_Dispatcher.lua')
+__Moose.Include('AI/AI_Patrol.lua')
+__Moose.Include('AI/AI_Cap.lua')
+__Moose.Include('AI/AI_Cas.lua')
+__Moose.Include('AI/AI_Bai.lua')
+__Moose.Include('AI/AI_Formation.lua')
+__Moose.Include('Actions/Act_Assign.lua')
+__Moose.Include('Actions/Act_Route.lua')
+__Moose.Include('Actions/Act_Account.lua')
+__Moose.Include('Actions/Act_Assist.lua')
+__Moose.Include('Tasking/CommandCenter.lua')
+__Moose.Include('Tasking/Mission.lua')
+__Moose.Include('Tasking/Task.lua')
+__Moose.Include('Tasking/DetectionManager.lua')
+__Moose.Include('Tasking/Task_A2G_Dispatcher.lua')
+__Moose.Include('Tasking/Task_A2G.lua')
+__Moose.Include('Tasking/Task_A2A_Dispatcher.lua')
+__Moose.Include('Tasking/Task_A2A.lua')
+__Moose.Include('Tasking/Task_Cargo.lua')
+__Moose.Include('Moose.lua')
+BASE:TraceOnOff(true)
+env.info('*** MOOSE INCLUDE END *** ')

Utils/Generate_Moose.bat

@@ -1,5 +1,5 @@
 %~dp0luarocks\lua5.1.exe %1 %2 %3 %4 %5
 call %~dp0LuaSrcDiet.bat --basic --opt-emptylines %5\Moose.lua
-del %5\Moose.lua
-copy %5\Moose_.lua %5\Moose.lua
-del Moose_.lua
+rem del %5\Moose.lua
+rem copy %5\Moose_.lua %5\Moose.lua
+rem del Moose_.lua