Merge branch 'develop' into FF/Develop

.appveyor/appveyor.yml

@@ -1,4 +1,4 @@
-version: 3.9.1.{build}
+version: 2.4.a.{build}
 shallow_clone: true
 skip_branch_with_pr: false
 skip_commits:
@@ -17,6 +17,7 @@ environment:
 platform:
   - x64
 
+
 init:
   - ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
@@ -61,7 +62,7 @@ build_script:
          $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody
        }
    - ps: | 
-       if( $env:appveyor_repo_branch -eq 'master' )     
+       if( $env:appveyor_repo_branch -eq 'master' -or $env:appveyor_repo_branch -eq 'develop' )     
        {
          $apiUrl = 'https://ci.appveyor.com/api'
          $token = 'qts80b5kpq0ooj4x6vvw'
@@ -69,13 +70,12 @@ build_script:
            "Authorization" = "Bearer $token"
            "Content-type" = "application/json"
            }
-         $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = 'master'; environmentVariables = @{} } | ConvertTo-Json
+         $RequestBody = @{ accountName = 'FlightControl-Master'; projectSlug = 'moose-docs'; branch = "$env:appveyor_repo_branch"; environmentVariables = @{} } | ConvertTo-Json
          # get project with last build details
          $project = Invoke-RestMethod -method Post -Uri "$apiUrl/builds" -Headers $headers -Body $RequestBody
        }
 
 
-
 test: off
 # test_script:
 #   - cmd: luacheck "Moose Development\Moose\moose.lua" "Moose Mission Setup\moose.lua"

Moose Development/Moose/AI/AI_A2A_Cap.lua

@@ -1,6 +1,6 @@
 --- **AI** -- (R2.2) - Models the process of Combat Air Patrol (CAP) for airplanes.
 --
--- This is a class used in the @{AI_A2A_Dispatcher}.
+-- This is a class used in the @{AI.AI_A2A_Dispatcher}.
 --
 -- ===
 -- 

Moose Development/Moose/AI/AI_A2A_Dispatcher.lua

@@ -155,7 +155,7 @@
 -- ### Authors: **FlightControl** rework of GCICAP + introduction of new concepts (squadrons).
 -- ### Authors: **Stonehouse**, **SNAFU** in terms of the advice, documentation, and the original GCICAP script.
 -- 
--- @module AI_A2A_Dispatcher
+-- @module AI.AI_A2A_Dispatcher
 
 
 

Moose Development/Moose/Core/Base.lua

@@ -9,7 +9,7 @@
 -- 
 -- ===
 -- 
--- @module Base
+-- @module Core.Base
 
 
 

Moose Development/Moose/Core/Database.lua

@@ -7,7 +7,7 @@
 -- 
 -- ===
 -- 
--- @module Database
+-- @module Core.Database
 
 
 --- @type DATABASE

Moose Development/Moose/Core/Event.lua

@@ -164,7 +164,7 @@
 -- 
 -- ===
 --
--- @module Event
+-- @module Core.Event
 
 
 --- The EVENT structure

Moose Development/Moose/Core/Fsm.lua

@@ -64,7 +64,7 @@
 -- 
 -- ===
 --
--- @module Fsm
+-- @module Core.Fsm
 
 do -- FSM
 

Moose Development/Moose/Core/Goal.lua

@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module Goal
+-- @module Core.Goal
 
 do -- Goal
 

Moose Development/Moose/Core/Menu.lua

@@ -30,7 +30,7 @@
 -- 
 -- ===
 --   
--- @module Menu
+-- @module Core.Menu
 
 
 MENU_INDEX = {}

Moose Development/Moose/Core/Message.lua

@@ -4,7 +4,7 @@
 -- 
 -- ===
 -- 
--- @module Message
+-- @module Core.Message
 
 --- The MESSAGE class
 -- @type MESSAGE

Moose Development/Moose/Core/Point.lua

@@ -26,7 +26,7 @@
 --
 -- ### Contributions:
 --
--- @module Point
+-- @module Core.Point
 
 
 

Moose Development/Moose/Core/Radio.lua

@@ -32,7 +32,7 @@
 --
 -- ### Author: Hugues "Grey_Echo" Bousquet
 --
--- @module Radio
+-- @module Core.Radio
 
 
 --- # RADIO class, extends @{Base#BASE}

Moose Development/Moose/Core/ScheduleDispatcher.lua

@@ -30,7 +30,7 @@
 -- ### Contributions: -
 -- ### Authors: FlightControl : Design & Programming
 -- 
--- @module ScheduleDispatcher
+-- @module Core.ScheduleDispatcher
 
 --- The SCHEDULEDISPATCHER structure
 -- @type SCHEDULEDISPATCHER

Moose Development/Moose/Core/Scheduler.lua

@@ -39,7 +39,7 @@
 -- 
 -- ===
 --
--- @module Scheduler
+-- @module Core.Scheduler
 
 
 --- The SCHEDULER class

Moose Development/Moose/Core/Set.lua

@@ -30,7 +30,7 @@
 -- 
 -- ===
 -- 
--- @module Set
+-- @module Core.Set
 
 
 --- @type SET_BASE

Moose Development/Moose/Core/Settings.lua

@@ -16,7 +16,7 @@
 -- 
 --   * **FlightControl**: Design & Programming
 --
--- @module Settings
+-- @module Core.Settings
 
 
 --- @type SETTINGS

Moose Development/Moose/Core/Spawn.lua

@@ -21,7 +21,7 @@
 -- 
 -- ===
 -- 
--- @module Spawn
+-- @module Core.Spawn
 
 
 --- SPAWN Class

Moose Development/Moose/Core/SpawnStatic.lua

@@ -29,7 +29,7 @@
 -- 
 -- ===
 -- 
--- @module SpawnStatic
+-- @module Core.SpawnStatic
 
 
 

Moose Development/Moose/Core/Spot.lua

@@ -38,7 +38,7 @@
 -- 
 -- ===
 -- 
--- @module Spot
+-- @module Core.Spot
 
 
 do

Moose Development/Moose/Core/UserFlag.lua

@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module UserFlag
+-- @module Core.UserFlag
 
 do -- UserFlag
 

Moose Development/Moose/Core/UserSound.lua

@@ -10,7 +10,7 @@
 -- 
 -- ===
 -- 
--- @module UserSound
+-- @module Core.UserSound
 
 do -- UserSound
 

Moose Development/Moose/Core/Velocity.lua

@@ -7,7 +7,7 @@
 -- 
 -- ===
 -- 
--- @module Velocity
+-- @module Core.Velocity
 
 do -- Velocity
 

Moose Development/Moose/Core/Zone.lua

@@ -34,7 +34,7 @@
 -- 
 -- ===
 -- 
--- @module Zone
+-- @module Core.Zone
 
 
 --- @type ZONE_BASE

Moose Development/Moose/Dcs/DCSAirbase.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSAirbase
+-- @module DCS.DCSAirbase
 
 
 --- Represents airbases: airdromes, helipads and ships with flying decks or landing pads.  

Moose Development/Moose/Dcs/DCSCoalitionObject.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSCoalitionObject
+-- @module DCS.DCSCoalitionObject
 
 --- @type CoalitionObject
 -- @extends Dcs.DCSWrapper.Object#Object

Moose Development/Moose/Dcs/DCSCommand.lua

@@ -1,4 +1,4 @@
---- @module DCSCommand
+--- @module DCS.DCSCommand
 
 
 --- @type Command

Moose Development/Moose/Dcs/DCSController.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSController
+-- @module DCS.DCSController
 
 --- Controller is an object that performs A.I.-routines. Other words controller is an instance of A.I.. Controller stores current main task, active enroute tasks and behavior options. Controller performs commands. Please, read DCS A-10C GUI Manual EN.pdf chapter "Task Planning for Unit Groups", page 91 to understand A.I. system of DCS:A-10C. 
 -- 

Moose Development/Moose/Dcs/DCSGroup.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSGroup
+-- @module DCS.DCSGroup
 
 --- Represents group of Units.
 -- @type Group

Moose Development/Moose/Dcs/DCSObject.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSObject
+-- @module DCS.DCSObject
 
 --- @type Object
 -- @field #Object.Category Category

Moose Development/Moose/Dcs/DCSStaticObject.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSStaticObject
+-- @module DCS.DCSStaticObject
 
 
 -------------------------------------------------------------------------------

Moose Development/Moose/Dcs/DCSTask.lua

@@ -1,4 +1,4 @@
---- @module DCSTask
+--- @module DCS.DCSTask
 
 
 --- A task descriptor (internal structure for DCS World)

Moose Development/Moose/Dcs/DCSTime.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSTime
+-- @module DCS.DCSTime
 
 --- @type ModelTime
 -- @extends #number

Moose Development/Moose/Dcs/DCSTypes.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSTypes
+-- @module DCS.DCSTypes
 
 
 

Moose Development/Moose/Dcs/DCSUnit.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSUnit
+-- @module DCS.DCSUnit
 
 --- @type Unit
 -- @extends Dcs.DCSCoalitionWrapper.Object#CoalitionObject

Moose Development/Moose/Dcs/DCSVec3.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSVec3
+-- @module DCS.DCSVec3
 
 
 

Moose Development/Moose/Dcs/DCSZone.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSZone
+-- @module DCS.DCSZone
 
 
 

Moose Development/Moose/Dcs/DCScoalition.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCScoalition
+-- @module DCS.DCScoalition
 
 --- @type coalition
 -- @field #coalition.side side

Moose Development/Moose/Dcs/DCScountry.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCScountry
+-- @module DCS.DCScountry
 
 --- @type country
 -- @field #country.id id

Moose Development/Moose/Dcs/DCSenv.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module env
+-- @module DCS.DCSenv
 
 --- @type env
 

Moose Development/Moose/Dcs/DCSland.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module land
+-- @module DCS.land
 
 --- @type land
 -- @field #land.SurfaceType SurfaceType

Moose Development/Moose/Dcs/DCStimer.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCStimer
+-- @module DCS.DCStimer
 
 --- @type timer
 

Moose Development/Moose/Dcs/DCStrigger.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCStrigger
+-- @module DCS.DCStrigger
 
 
 trigger = {} --#timer

Moose Development/Moose/Dcs/DCSworld.lua

@@ -1,5 +1,5 @@
 -------------------------------------------------------------------------------
--- @module DCSWorld
+-- @module DCS.DCSWorld
 
 --- @type world
 -- @field #world.event event