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

# Conflicts:
#	Moose Development/Moose/Functional/AmmoTruck.lua
#	Moose Development/Moose/Ops/Awacs.lua

Moose Development/Moose/Ops/Awacs.lua

@@ -1,4 +1,4 @@
---- **Ops** - AWACS
+--- **Ops** - MOOSE AI AWACS Operations using text-to-speech.
 -- 
 -- ===
 -- 
@@ -3348,15 +3348,15 @@ function AWACS:_Showtask(Group)
           local targetpos = currenttask.Target:GetCoordinate()
           local direction, direcTTS = self:_ToStringBR(pposition,targetpos)
           description = description .. "\nBR "..direction
-		      descTTS = descTTS .. ";BR "..direcTTS
+          descTTS = descTTS .. ";BR "..direcTTS
         end
         local statustxt = self.gettext:GetEntry("STATUS",self.locale)  
         --MESSAGE:New(string.format("%s\n%s %s",description,statustxt,status),30,"AWACS",true):ToGroup(Group)
-	      local text = string.format("%s\n%s %s",description,statustxt,status)
+        local text = string.format("%s\n%s %s",description,statustxt,status)
         local ttstext = string.format("%s. %s. %s",managedgroup.CallSign,self.callsigntxt,descTTS)
         ttstext = string.gsub(ttstext,"\\n",";")
         ttstext = string.gsub(ttstext,"VID","V I D")
-		    self:_NewRadioEntry(ttstext,text,GID,true,true,false,false,true)
+        self:_NewRadioEntry(ttstext,text,GID,true,true,false,false,true)
       end
     end
    end

Moose Development/Moose/Ops/Intelligence.lua

@@ -159,7 +159,7 @@ INTEL.Ctype={
 
 --- INTEL class version.
 -- @field #string version
-INTEL.version="0.3.4"
+INTEL.version="0.3.5"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -815,8 +815,8 @@ function INTEL:UpdateIntel()
       end
     end
 
-    -- Filter unit categories.
-    if #self.filterCategory>0 then
+    -- Filter unit categories. Added check that we have a UNIT and not a STATIC object because :GetUnitCategory() is only available for units.
+    if #self.filterCategory>0 and unit:IsInstanceOf("UNIT") then
       local unitcategory=unit:GetUnitCategory()
       local keepit=false
       for _,filtercategory in pairs(self.filterCategory) do
@@ -1077,11 +1077,13 @@ function INTEL:GetDetectedUnits(Unit, DetectedUnits, RecceDetecting, DetectVisua
           RecceDetecting[name]=reccename
           self:T(string.format("Unit %s detect by %s", name, reccename))
         else
-          local static=STATIC:FindByName(name, false)
-          if static then
-            --env.info("FF found static "..name)
-            DetectedUnits[name]=static
-            RecceDetecting[name]=reccename
+          if self.detectStatics then
+            local static=STATIC:FindByName(name, false)
+            if static then
+              --env.info("FF found static "..name)
+              DetectedUnits[name]=static
+              RecceDetecting[name]=reccename
+            end
           end
         end