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

Moose Development/Moose/Core/Point.lua

@@ -2456,15 +2456,18 @@ do -- COORDINATE
         -- Write command as string and execute that. Idea by Grimes https://forum.dcs.world/topic/324201-mark-to-all-function/#comment-5273793
         local s=string.format("trigger.action.markupToAll(7, %d, %d,", Coalition, MarkID)
         for _,vec in pairs(vecs) do
-          s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
+          --s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
+          s=s..string.format("{x=%.1f, y=%.1f, z=%.1f},", vec.x, vec.y, vec.z)
         end
-        s=s..string.format("%s, %s, %s, %s", UTILS._OneLineSerialize(Color), UTILS._OneLineSerialize(FillColor), tostring(LineType), tostring(ReadOnly))
+        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", Color[1], Color[2], Color[3], Color[4])
-        if Text and Text~="" then
+        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", FillColor[1], FillColor[2], FillColor[3], FillColor[4])
-          s=s..string.format(", \"%s\"", Text)
+        s=s..string.format("%d,", LineType or 1)
+        s=s..string.format("%s", tostring(ReadOnly))
+        if Text and type(Text)=="string" and string.len(Text)>0 then
+          s=s..string.format(", \"%s\"", tostring(Text))
         end
         s=s..")"
         
-        
         -- Execute string command
         local success=UTILS.DoString(s)
                 

Moose Development/Moose/Core/Zone.lua

@@ -2496,6 +2496,7 @@ end
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:DrawZone(Coalition, Color, Alpha, FillColor, FillAlpha, LineType, ReadOnly, IncludeTriangles)
 
+  
   if self._.Polygon and #self._.Polygon >= 3 then
     Coalition = Coalition or self:GetDrawCoalition()
   
@@ -2517,6 +2518,21 @@ function ZONE_POLYGON_BASE:DrawZone(Coalition, Color, Alpha, FillColor, FillAlph
     end
   end
 
+
+  if false then
+    local coords = self:GetVerticiesCoordinates()
+
+    local coord=coords[1] --Core.Point#COORDINATE
+
+    table.remove(coords, 1)
+
+    coord:MarkupToAllFreeForm(coords, Coalition, Color, Alpha, FillColor, FillAlpha, LineType, ReadOnly, "Drew Polygon")
+
+    if true then
+      return
+    end
+  end
+
   return self
 end
 
@@ -3673,13 +3689,17 @@ ZONE_OVAL = {
 
 --- Creates a new ZONE_OVAL from a center point, major axis, minor axis, and angle.
 --- ported from https://github.com/nielsvaes/CCMOOSE/blob/master/Moose%20Development/Moose/Shapes/Oval.lua
+-- @param #ZONE_OVAL self
+-- @param #string name Name of the zone.
 -- @param #table vec2 The center point of the oval
 -- @param #number major_axis The major axis of the oval
 -- @param #number minor_axis The minor axis of the oval
 -- @param #number angle The angle of the oval
 -- @return #ZONE_OVAL The new oval
 function ZONE_OVAL:New(name, vec2, major_axis, minor_axis, angle)
+
     self = BASE:Inherit(self, ZONE_BASE:New())
+
     self.ZoneName = name
     self.CenterVec2 = vec2
     self.MajorAxis = major_axis

Moose Development/Moose/Ops/ATIS.lua

@@ -890,7 +890,7 @@ _ATIS = {}
 
 --- ATIS class version.
 -- @field #string version
-ATIS.version = "0.10.4"
+ATIS.version = "1.0.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1528,12 +1528,12 @@ end
 
 --- Use SRS Simple-Text-To-Speech for transmissions. No sound files necessary.
 -- @param #ATIS self
--- @param #string PathToSRS Path to SRS directory.
+-- @param #string PathToSRS Path to SRS directory (only necessary if SRS exe backend is used).
 -- @param #string Gender Gender: "male" or "female" (default).
 -- @param #string Culture Culture, e.g. "en-GB" (default).
 -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`.
 -- @param #number Port SRS port. Default 5002.
--- @param #string GoogleKey Path to Google JSON-Key.
+-- @param #string GoogleKey Path to Google JSON-Key (SRS exe backend) or Google API key (DCS-gRPC backend).
 -- @return #ATIS self
 function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey)
   if PathToSRS or MSRS.path then

docs/beginner/demo-missions.md

@@ -9,14 +9,14 @@ nav_order: 04
 1. Table of contents
 {:toc}
 
-The best way to get compftable with a Moose class is to try the demo missions of
+The best way to get comfortable with a Moose class is to try the demo missions
-the class you want to learn. The Moose team created a lot of demo missions for
+of the class you want to learn. The Moose team created a lot of demo missions
-most of the classes.
+for most of the classes.
 
 ## Download demo missions
 
 Go to the repository [MOOSE_MISSIONS]{:target="_blank"}, search the folder of
-the class, download the mission (`.miz`) and rum them.
+the class, download the mission (`.miz`) and run them.
 
 ## Read the mission script
 
@@ -49,7 +49,7 @@ If you want to use more functions combine them all up.
 
 ## Next step
 
-If the mission shows not the expected behaviour take a look at section
+If the mission does not show the expected behaviour take a look at section
 [problems].
 
 [MOOSE_MISSIONS]: https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop

docs/repositories.md

@@ -26,14 +26,30 @@ You only need to load **one** of those files at the beginning of your mission.
 
 This repository contains the generated documentation and pictures and other references.
 The generated documentation is reflected in html and is published at: 
-- Stable `master` branch: <https://flightcontrol-master.github.io/MOOSE_DOCS/>
+- `master`  branch: <https://flightcontrol-master.github.io/MOOSE_DOCS/>
 - `develop` branch: <https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/>
 
+## [MOOSE_GUIDES](https://github.com/FlightControl-Master/MOOSE_GUIDES) - For external documentation and help
+
+This repository will be removed in future.
+
+## [MOOSE_PRESENTATIONS](https://github.com/FlightControl-Master/MOOSE_PRESENTATIONS)
+
+A collection of presentations used in the videos on the youtube channel of FlightControl.
+
 ## [MOOSE_MISSIONS](https://github.com/FlightControl-Master/MOOSE_MISSIONS) - For users (provides demo missions)
 
 This repository contains all the demonstration missions in packed format (*.miz),
 and can be used without any further setup in DCS WORLD.
 
+## [Moose_Community_Scripts](https://github.com/FlightControl-Master/Moose_Community_Scripts)
+
+This repository is for Moose based helper scripts, snippets, functional demos.
+
+## [MOOSE_SOUND](https://github.com/FlightControl-Master/MOOSE_SOUND)
+
+Sound packs for different MOOSE framework classes.
+
 ## [MOOSE_MISSIONS_DYNAMIC](https://github.com/FlightControl-Master/MOOSE_MISSIONS_DYNAMIC) - Outdated
 
 This repository will be removed in future.
@@ -41,3 +57,11 @@ This repository will be removed in future.
 ## [MOOSE_MISSIONS_UNPACKED](https://github.com/FlightControl-Master/MOOSE_MISSIONS_UNPACKED) - Outdated
 
 This repository will be removed in future.
+
+## [MOOSE_COMMUNITY_MISSIONS](https://github.com/FlightControl-Master/MOOSE_COMMUNITY_MISSIONS) - Outdated
+
+A database of missions created by the community, using MOOSE.
+
+## [MOOSE_TOOLS](https://github.com/FlightControl-Master/MOOSE_TOOLS) - Outdated
+
+A collection of the required tools to develop and contribute in the MOOSE framework for DCS World.