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

This commit is contained in:
FlightControl 2017-03-29 06:17:04 +02:00
commit 9cb661cf29
15 changed files with 7 additions and 5 deletions

View File

@ -1388,7 +1388,7 @@ do -- DETECTION_UNITS
self:F()
local Report = REPORT:New( "Detected units:" )
for DetectedItemID, DetectedItem in ipairs( self.DetectedItems ) do
for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItem = DetectedItem -- #DETECTION_BASE.DetectedItem
local ReportSummary = self:DetectedItemReportSummary( DetectedItemID )
Report:Add( ReportSummary )

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170327_1219' )
env.info( 'Moose Generation Timestamp: 20170328_1316' )
local base = _G
Include = {}
@ -27530,7 +27530,7 @@ do -- DETECTION_UNITS
self:F()
local Report = REPORT:New( "Detected units:" )
for DetectedItemID, DetectedItem in ipairs( self.DetectedItems ) do
for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItem = DetectedItem -- #DETECTION_BASE.DetectedItem
local ReportSummary = self:DetectedItemReportSummary( DetectedItemID )
Report:Add( ReportSummary )

View File

@ -1,5 +1,5 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' )
env.info( 'Moose Generation Timestamp: 20170327_1219' )
env.info( 'Moose Generation Timestamp: 20170328_1316' )
local base = _G
Include = {}
@ -27530,7 +27530,7 @@ do -- DETECTION_UNITS
self:F()
local Report = REPORT:New( "Detected units:" )
for DetectedItemID, DetectedItem in ipairs( self.DetectedItems ) do
for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItem = DetectedItem -- #DETECTION_BASE.DetectedItem
local ReportSummary = self:DetectedItemReportSummary( DetectedItemID )
Report:Add( ReportSummary )

View File

@ -33,6 +33,8 @@ RecceDetection:Start()
-- @param #string To The To State string.
function RecceDetection:OnAfterDetect(From,Event,To)
self:E("Detect")
local DetectionReport = RecceDetection:DetectedReportDetailed()
CC:MessageToAll( DetectionReport, 15, "" )