FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Moose Development/Moose/AI/AI_A2A_Cap.lua
#	Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2A_Gci.lua
#	Moose Development/Moose/AI/AI_A2A_Patrol.lua
#	Moose Development/Moose/AI/AI_A2G_BAI.lua
#	Moose Development/Moose/AI/AI_A2G_CAS.lua
#	Moose Development/Moose/AI/AI_A2G_Dispatcher.lua
#	Moose Development/Moose/AI/AI_A2G_SEAD.lua
#	Moose Development/Moose/AI/AI_Air.lua
#	Moose Development/Moose/AI/AI_Air_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Air_Engage.lua
#	Moose Development/Moose/AI/AI_Air_Patrol.lua
#	Moose Development/Moose/AI/AI_Air_Squadron.lua
#	Moose Development/Moose/AI/AI_BAI.lua
#	Moose Development/Moose/AI/AI_Balancer.lua
#	Moose Development/Moose/AI/AI_CAP.lua
#	Moose Development/Moose/AI/AI_CAS.lua
#	Moose Development/Moose/AI/AI_Cargo.lua
#	Moose Development/Moose/AI/AI_Cargo_APC.lua
#	Moose Development/Moose/AI/AI_Cargo_Airplane.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua
#	Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
#	Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
#	Moose Development/Moose/AI/AI_Cargo_Ship.lua
#	Moose Development/Moose/AI/AI_Escort.lua
#	Moose Development/Moose/AI/AI_Escort_Dispatcher.lua
#	Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua
#	Moose Development/Moose/AI/AI_Escort_Request.lua
#	Moose Development/Moose/AI/AI_Formation.lua
#	Moose Development/Moose/AI/AI_Patrol.lua
#	Moose Development/Moose/Actions/Act_Account.lua
#	Moose Development/Moose/Actions/Act_Assign.lua
#	Moose Development/Moose/Actions/Act_Assist.lua
#	Moose Development/Moose/Actions/Act_Route.lua
#	Moose Development/Moose/Cargo/Cargo.lua
#	Moose Development/Moose/Cargo/CargoCrate.lua
#	Moose Development/Moose/Cargo/CargoGroup.lua
#	Moose Development/Moose/Cargo/CargoSlingload.lua
#	Moose Development/Moose/Cargo/CargoUnit.lua
#	Moose Development/Moose/Tasking/CommandCenter.lua
#	Moose Development/Moose/Tasking/DetectionManager.lua
#	Moose Development/Moose/Tasking/Mission.lua
#	Moose Development/Moose/Tasking/Task.lua
#	Moose Development/Moose/Tasking/TaskInfo.lua
#	Moose Development/Moose/Tasking/Task_A2A.lua
#	Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua
#	Moose Development/Moose/Tasking/Task_A2G.lua
#	Moose Development/Moose/Tasking/Task_A2G_Dispatcher.lua
#	Moose Development/Moose/Tasking/Task_CARGO.lua
#	Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua
#	Moose Development/Moose/Tasking/Task_Capture_Zone.lua
#	Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
#	Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua
#	Moose Development/Moose/Tasking/Task_Cargo_Transport.lua
#	Moose Development/Moose/Tasking/Task_Manager.lua
This commit is contained in:
Applevangelist 2025-05-16 11:56:23 +02:00
commit 5ff314d8e0
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Functional/Mantis.lua
View File

@ -1035,7 +1035,7 @@ do
--- Function to set how long INTEL DLINK remembers contacts.
-- @param #MANTIS self
-- @param #number seconds Remember this many seconds
-- @param #number seconds Remember this many seconds, at least 5 seconds.
-- @return #MANTIS self
function MANTIS:SetDLinkCacheTime(seconds)
self.DLinkCacheTime = math.abs(seconds or 120)

2
Moose Development/Moose/Functional/MissileTrainer.lua
View File

@ -53,6 +53,8 @@
--
-- # Developer Note
--
-- ![Banner Image](..\Images\deprecated.png)
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE.
-- Therefore, this class is considered to be deprecated and superseded by the [Functional.Fox](https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/Documentation/Functional.Fox.html) class, which provides the same functionality.
--

2
Moose Development/Moose/Functional/ZoneGoalCargo.lua
View File

@ -7,6 +7,8 @@
--
-- # Developer Note
--
-- ![Banner Image](..\Images\deprecated.png)
--
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated
--

2
Moose Development/Moose/Wrapper/Airbase.lua
View File

@ -513,6 +513,7 @@ AIRBASE.TheChannel = {
-- * AIRBASE.Syria.Hatzor
-- * AIRBASE.Syria.Palmashim
-- * AIRBASE.Syria.Tel_Nof
-- * AIRBASE.Syria.Marka
--
--@field Syria
AIRBASE.Syria={
@ -586,6 +587,7 @@ AIRBASE.Syria={
["Hatzor"] = "Hatzor",
["Palmashim"] = "Palmashim",
["Tel_Nof"] = "Tel Nof",
["Marka"] = "Marka",
}
--- Airbases of the Mariana Islands map: