weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into FF/Develop

Browse Source
This commit is contained in:
Frank 2018-09-26 22:36:52 +02:00
commit f09443c949
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Cargo/CargoUnit.lua
View File

@ -297,7 +297,7 @@ do -- CARGO_UNIT
if CargoCarrier and CargoCarrier:IsAlive() and self.CargoObject and self.CargoObject:IsAlive() then if CargoCarrier and CargoCarrier:IsAlive() and self.CargoObject and self.CargoObject:IsAlive() then
if (CargoCarrier:IsAir() and not CargoCarrier:InAir()) or true then if (CargoCarrier:IsAir() and not CargoCarrier:InAir()) or true then
local NearRadius = CargoCarrier:GetBoundingRadius( NearRadius ) + 5 local NearRadius = NearRadius or CargoCarrier:GetBoundingRadius( NearRadius ) + 5
if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then if self:IsNear( CargoCarrier:GetPointVec2(), NearRadius ) then
self:__Load( 1, CargoCarrier, ... ) self:__Load( 1, CargoCarrier, ... )
else else

2
Moose Development/Moose/Core/Fsm.lua
View File

@ -325,7 +325,7 @@ do -- FSM
-- --
-- === -- ===
-- --
-- @field #FSM FSM -- @field #FSM
-- --
FSM = { FSM = {
ClassName = "FSM", ClassName = "FSM",

6
Moose Development/Moose/Tasking/DetectionManager.lua
View File

@ -43,11 +43,13 @@
do -- DETECTION MANAGER do -- DETECTION MANAGER
--- DETECTION_MANAGER class. --- @type DETECTION_MANAGER
-- @type DETECTION_MANAGER
-- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to. -- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to.
-- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects. -- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects.
-- @extends Core.Fsm#FSM -- @extends Core.Fsm#FSM
--- DETECTION_MANAGER class.
-- @field #DETECTION_MANAGER
DETECTION_MANAGER = { DETECTION_MANAGER = {
ClassName = "DETECTION_MANAGER", ClassName = "DETECTION_MANAGER",
SetGroup = nil, SetGroup = nil,