Merge remote-tracking branch 'origin/master' into develop

# Conflicts:
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
#	Moose Development/Moose/Functional/ZoneGoalCoalition.lua
This commit is contained in:
Applevangelist 2022-11-11 09:38:27 +01:00
commit 0db13b6cdf
7 changed files with 7 additions and 7 deletions

View File

@ -1,4 +1,4 @@
--- **AI** - (R2.4) - Models the intelligent transportation of infantry and other cargo using Planes. --- **AI** - Models the intelligent transportation of infantry and other cargo using Planes.
-- --
-- ## Features: -- ## Features:
-- --

View File

@ -1,4 +1,4 @@
--- **AI** - (R2.5.1) - Models the intelligent transportation of infantry and other cargo. --- **AI** - Models the intelligent transportation of infantry and other cargo.
-- --
-- === -- ===
-- --

View File

@ -1,4 +1,4 @@
--- **Functional** - (R2.5) - Yet Another Missile Trainer. --- **Functional** - Yet Another Missile Trainer.
-- --
-- --
-- Practice to evade missiles without being destroyed. -- Practice to evade missiles without being destroyed.

View File

@ -1,4 +1,4 @@
--- **Functional** - Rudimentary ATC. --- **Functional** - Basic ATC.
-- --
-- ![Banner Image](..\Presentations\PSEUDOATC\PSEUDOATC_Main.jpg) -- ![Banner Image](..\Presentations\PSEUDOATC\PSEUDOATC_Main.jpg)
-- --

View File

@ -1,4 +1,4 @@
--- **Functional (WIP)** - Base class that models processes to achieve goals involving a Zone. --- **Functional** - Base class that models processes to achieve goals involving a Zone.
-- --
-- === -- ===
-- --

View File

@ -1,4 +1,4 @@
--- **Functional (WIP)** - Base class that models processes to achieve goals involving a Zone and Cargo. --- **Functional** - Base class that models processes to achieve goals involving a Zone and Cargo.
-- --
-- === -- ===
-- --

View File

@ -1,4 +1,4 @@
--- Various routines --- Various routines.
-- @module Utilities.Routines -- @module Utilities.Routines
-- @image MOOSE.JPG -- @image MOOSE.JPG
env.setErrorMessageBoxEnabled( false ) env.setErrorMessageBoxEnabled( false )