Merge branch 'master' into release

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/Metis-Team/mts_marker/releases/latest">
-        <img src="https://img.shields.io/badge/Version-1.4.1-blue.svg?style=flat-square" alt="Metis Marker Version">
+        <img src="https://img.shields.io/badge/Version-1.5.0-blue.svg?style=flat-square" alt="Metis Marker Version">
     </a>
     <a href="https://github.com/Metis-Team/mts_marker/releases/latest">
         <img src="https://img.shields.io/github/downloads/Metis-Team/mts_marker/total.svg?style=flat-square&label=Downloads" alt="Metis Marker Downloads">
@@ -48,20 +48,25 @@ Our customizable marker system consists of:
     - Reinforced or Reduced
     - Higher Formation
     - Unique Designation
+    - Additional Information
 
 ## FAQ
 - Q: Does the mod have to be run on the server?  
- A: Yes
+  A: Yes
 - Q: Can we get the option to draw control measure symbols (e.g. the attack arrow)?  
- A: No. Here's why:
-  1. Arma already provides the ability to draw lines, so you can easily make them.
-  2. Creating such a system would be too complex because CMS are very customizable (they can vary in length, width, curvature, etc.). We would need to create a framework similar to 3DEN shapes (I mean the rectangles, etc.) and still add more (you can't curve 3DEN shapes).
+  A: No. Here's why:
+    1. Arma already provides the ability to draw lines, so you can easily make them.
+    2. Creating such a system would be too complex because CMS are very customizable (they can vary in length, width, curvature, etc.). We would need to create a framework similar to 3DEN shapes (I mean the rectangles, etc.) and still add more (you can't curve 3DEN shapes).
 - Q: Can I draw markers in the 3DEN editor  
- A: Yes, standard keybind applies (default: right alt).
+  A: Yes, standard keybind applies (default: right alt).
 - Q: Can I draw markers in the mission planning screen?  
- A: Yes, standard keybind applies (default: SHIFT + LMB)
+  A: Yes, standard keybind applies (default: SHIFT + LMB)
+- Q: I can't see markers placed in the 3DEN editor when I'm ingame?  
+  A: The mission needs to be saved for the markers to appear ingame.
+- Q: Is there an option to change the color scheme of the markers to the Arma vanilla style?  
+  A: Yes! In the CBA Settings you can set Metis Marker to use Arma colors instead of the APP-6(C) colors.
 - Q: Where can I find more infos about this mod?  
- A: You can read our [Wiki](https://github.com/Metis-Team/mts_marker/wiki)
+  A: You can read our [Wiki](https://github.com/Metis-Team/mts_marker/wiki)
 
 ## Contributions
 - [GodofMonkeys](https://github.com/GodofMonkeys): Chinese/Simplified Chinese translation
@@ -83,17 +88,14 @@ Metis Marker is licensed under Arma Public License No Derivatives ([APL-ND](http
     <img src="https://i.imgur.com/ZHi6e4d.jpg" width="1024">
 </p>
 <p align="center">
-    <img src="https://i.imgur.com/XVVeHLV.jpg" width="1024">
+    <img src="https://i.imgur.com/gI50G7B.jpg" width="1024">
 </p>
 <p align="center">
-    <img src="https://i.imgur.com/KjEGjsM.jpg" width="1024">
+    <img src="https://i.imgur.com/0WT8eAE.jpg" width="1024">
 </p>
 <p align="center">
-    <img src="https://i.imgur.com/mJfepWT.jpg" width="1024">
+    <img src="https://i.imgur.com/u7R6yoL.jpg" width="1024">
 </p>
 <p align="center">
-    <img src="https://i.imgur.com/IzWNkAD.jpg" width="1024">
-</p>
-<p align="center">
-    <img src="https://i.imgur.com/8mWm7oH.jpg" width="1024">
+    <img src="https://i.imgur.com/2alXzvc.jpg" width="1024">
 </p>

addons/markers/CfgMarkers.hpp

@@ -12,6 +12,11 @@ class CfgMarkers {
     class mts_com_##MODIFIER##_##NAME##: mts_blu_frameshape { \
         icon = QPATHTOF(data\com\MODIFIER\MARKERFILE(com,MODIFIER,NAME)); \
     }
+    #define ALPHANUMMARKERFILE(ANCHOR,POSITION,LETTER) mts_markers_alphanum_##ANCHOR##_##POSITION##_##LETTER##.paa
+    #define ALPHANUMMARKER(ANCHOR,POSITION,LETTER) \
+    class mts_alphanum_##ANCHOR##_##POSITION##_##LETTER##: mts_blu_frameshape { \
+        icon = QPATHTOF(data\alphanum\ANCHOR\POSITION\ALPHANUMMARKERFILE(ANCHOR,POSITION,LETTER)); \
+    }
 
     class b_unknown;
     class o_unknown;
@@ -80,9 +85,10 @@ class CfgMarkers {
         size = 32;
     };
 
-    #include "CfgMarkersBlufor.hpp"
-    #include "CfgMarkersRedfor.hpp"
-    #include "CfgMarkersNeutral.hpp"
-    #include "CfgMarkersUnknown.hpp"
-    #include "CfgMarkersCommon.hpp"
+    #include "CfgMarkers\CfgMarkersBlufor.hpp"
+    #include "CfgMarkers\CfgMarkersRedfor.hpp"
+    #include "CfgMarkers\CfgMarkersNeutral.hpp"
+    #include "CfgMarkers\CfgMarkersUnknown.hpp"
+    #include "CfgMarkers\CfgMarkersCommon.hpp"
+    #include "CfgMarkers\CfgMarkersAlphanumeric.hpp"
 };

addons/markers/CfgMarkers/CfgMarkersAlphanumeric.hpp

@@ -0,0 +1,2 @@
+#include "CfgMarkersAlphanumericLB.hpp"
+#include "CfgMarkersAlphanumericRB.hpp"

addons/markers/CfgMarkers/CfgMarkersAlphanumericLB.hpp

@@ -0,0 +1,225 @@
+// Alphanumeric markers for anchor lb
+// This file is generated and should not be edited
+
+ALPHANUMMARKER(lb,0,A);
+ALPHANUMMARKER(lb,0,B);
+ALPHANUMMARKER(lb,0,C);
+ALPHANUMMARKER(lb,0,D);
+ALPHANUMMARKER(lb,0,E);
+ALPHANUMMARKER(lb,0,F);
+ALPHANUMMARKER(lb,0,G);
+ALPHANUMMARKER(lb,0,H);
+ALPHANUMMARKER(lb,0,I);
+ALPHANUMMARKER(lb,0,J);
+ALPHANUMMARKER(lb,0,K);
+ALPHANUMMARKER(lb,0,L);
+ALPHANUMMARKER(lb,0,M);
+ALPHANUMMARKER(lb,0,N);
+ALPHANUMMARKER(lb,0,O);
+ALPHANUMMARKER(lb,0,P);
+ALPHANUMMARKER(lb,0,Q);
+ALPHANUMMARKER(lb,0,R);
+ALPHANUMMARKER(lb,0,S);
+ALPHANUMMARKER(lb,0,T);
+ALPHANUMMARKER(lb,0,U);
+ALPHANUMMARKER(lb,0,V);
+ALPHANUMMARKER(lb,0,W);
+ALPHANUMMARKER(lb,0,X);
+ALPHANUMMARKER(lb,0,Y);
+ALPHANUMMARKER(lb,0,Z);
+ALPHANUMMARKER(lb,0,0);
+ALPHANUMMARKER(lb,0,1);
+ALPHANUMMARKER(lb,0,2);
+ALPHANUMMARKER(lb,0,3);
+ALPHANUMMARKER(lb,0,4);
+ALPHANUMMARKER(lb,0,5);
+ALPHANUMMARKER(lb,0,6);
+ALPHANUMMARKER(lb,0,7);
+ALPHANUMMARKER(lb,0,8);
+ALPHANUMMARKER(lb,0,9);
+
+ALPHANUMMARKER(lb,1,A);
+ALPHANUMMARKER(lb,1,B);
+ALPHANUMMARKER(lb,1,C);
+ALPHANUMMARKER(lb,1,D);
+ALPHANUMMARKER(lb,1,E);
+ALPHANUMMARKER(lb,1,F);
+ALPHANUMMARKER(lb,1,G);
+ALPHANUMMARKER(lb,1,H);
+ALPHANUMMARKER(lb,1,I);
+ALPHANUMMARKER(lb,1,J);
+ALPHANUMMARKER(lb,1,K);
+ALPHANUMMARKER(lb,1,L);
+ALPHANUMMARKER(lb,1,M);
+ALPHANUMMARKER(lb,1,N);
+ALPHANUMMARKER(lb,1,O);
+ALPHANUMMARKER(lb,1,P);
+ALPHANUMMARKER(lb,1,Q);
+ALPHANUMMARKER(lb,1,R);
+ALPHANUMMARKER(lb,1,S);
+ALPHANUMMARKER(lb,1,T);
+ALPHANUMMARKER(lb,1,U);
+ALPHANUMMARKER(lb,1,V);
+ALPHANUMMARKER(lb,1,W);
+ALPHANUMMARKER(lb,1,X);
+ALPHANUMMARKER(lb,1,Y);
+ALPHANUMMARKER(lb,1,Z);
+ALPHANUMMARKER(lb,1,0);
+ALPHANUMMARKER(lb,1,1);
+ALPHANUMMARKER(lb,1,2);
+ALPHANUMMARKER(lb,1,3);
+ALPHANUMMARKER(lb,1,4);
+ALPHANUMMARKER(lb,1,5);
+ALPHANUMMARKER(lb,1,6);
+ALPHANUMMARKER(lb,1,7);
+ALPHANUMMARKER(lb,1,8);
+ALPHANUMMARKER(lb,1,9);
+
+ALPHANUMMARKER(lb,2,A);
+ALPHANUMMARKER(lb,2,B);
+ALPHANUMMARKER(lb,2,C);
+ALPHANUMMARKER(lb,2,D);
+ALPHANUMMARKER(lb,2,E);
+ALPHANUMMARKER(lb,2,F);
+ALPHANUMMARKER(lb,2,G);
+ALPHANUMMARKER(lb,2,H);
+ALPHANUMMARKER(lb,2,I);
+ALPHANUMMARKER(lb,2,J);
+ALPHANUMMARKER(lb,2,K);
+ALPHANUMMARKER(lb,2,L);
+ALPHANUMMARKER(lb,2,M);
+ALPHANUMMARKER(lb,2,N);
+ALPHANUMMARKER(lb,2,O);
+ALPHANUMMARKER(lb,2,P);
+ALPHANUMMARKER(lb,2,Q);
+ALPHANUMMARKER(lb,2,R);
+ALPHANUMMARKER(lb,2,S);
+ALPHANUMMARKER(lb,2,T);
+ALPHANUMMARKER(lb,2,U);
+ALPHANUMMARKER(lb,2,V);
+ALPHANUMMARKER(lb,2,W);
+ALPHANUMMARKER(lb,2,X);
+ALPHANUMMARKER(lb,2,Y);
+ALPHANUMMARKER(lb,2,Z);
+ALPHANUMMARKER(lb,2,0);
+ALPHANUMMARKER(lb,2,1);
+ALPHANUMMARKER(lb,2,2);
+ALPHANUMMARKER(lb,2,3);
+ALPHANUMMARKER(lb,2,4);
+ALPHANUMMARKER(lb,2,5);
+ALPHANUMMARKER(lb,2,6);
+ALPHANUMMARKER(lb,2,7);
+ALPHANUMMARKER(lb,2,8);
+ALPHANUMMARKER(lb,2,9);
+
+ALPHANUMMARKER(lb,3,A);
+ALPHANUMMARKER(lb,3,B);
+ALPHANUMMARKER(lb,3,C);
+ALPHANUMMARKER(lb,3,D);
+ALPHANUMMARKER(lb,3,E);
+ALPHANUMMARKER(lb,3,F);
+ALPHANUMMARKER(lb,3,G);
+ALPHANUMMARKER(lb,3,H);
+ALPHANUMMARKER(lb,3,I);
+ALPHANUMMARKER(lb,3,J);
+ALPHANUMMARKER(lb,3,K);
+ALPHANUMMARKER(lb,3,L);
+ALPHANUMMARKER(lb,3,M);
+ALPHANUMMARKER(lb,3,N);
+ALPHANUMMARKER(lb,3,O);
+ALPHANUMMARKER(lb,3,P);
+ALPHANUMMARKER(lb,3,Q);
+ALPHANUMMARKER(lb,3,R);
+ALPHANUMMARKER(lb,3,S);
+ALPHANUMMARKER(lb,3,T);
+ALPHANUMMARKER(lb,3,U);
+ALPHANUMMARKER(lb,3,V);
+ALPHANUMMARKER(lb,3,W);
+ALPHANUMMARKER(lb,3,X);
+ALPHANUMMARKER(lb,3,Y);
+ALPHANUMMARKER(lb,3,Z);
+ALPHANUMMARKER(lb,3,0);
+ALPHANUMMARKER(lb,3,1);
+ALPHANUMMARKER(lb,3,2);
+ALPHANUMMARKER(lb,3,3);
+ALPHANUMMARKER(lb,3,4);
+ALPHANUMMARKER(lb,3,5);
+ALPHANUMMARKER(lb,3,6);
+ALPHANUMMARKER(lb,3,7);
+ALPHANUMMARKER(lb,3,8);
+ALPHANUMMARKER(lb,3,9);
+
+ALPHANUMMARKER(lb,4,A);
+ALPHANUMMARKER(lb,4,B);
+ALPHANUMMARKER(lb,4,C);
+ALPHANUMMARKER(lb,4,D);
+ALPHANUMMARKER(lb,4,E);
+ALPHANUMMARKER(lb,4,F);
+ALPHANUMMARKER(lb,4,G);
+ALPHANUMMARKER(lb,4,H);
+ALPHANUMMARKER(lb,4,I);
+ALPHANUMMARKER(lb,4,J);
+ALPHANUMMARKER(lb,4,K);
+ALPHANUMMARKER(lb,4,L);
+ALPHANUMMARKER(lb,4,M);
+ALPHANUMMARKER(lb,4,N);
+ALPHANUMMARKER(lb,4,O);
+ALPHANUMMARKER(lb,4,P);
+ALPHANUMMARKER(lb,4,Q);
+ALPHANUMMARKER(lb,4,R);
+ALPHANUMMARKER(lb,4,S);
+ALPHANUMMARKER(lb,4,T);
+ALPHANUMMARKER(lb,4,U);
+ALPHANUMMARKER(lb,4,V);
+ALPHANUMMARKER(lb,4,W);
+ALPHANUMMARKER(lb,4,X);
+ALPHANUMMARKER(lb,4,Y);
+ALPHANUMMARKER(lb,4,Z);
+ALPHANUMMARKER(lb,4,0);
+ALPHANUMMARKER(lb,4,1);
+ALPHANUMMARKER(lb,4,2);
+ALPHANUMMARKER(lb,4,3);
+ALPHANUMMARKER(lb,4,4);
+ALPHANUMMARKER(lb,4,5);
+ALPHANUMMARKER(lb,4,6);
+ALPHANUMMARKER(lb,4,7);
+ALPHANUMMARKER(lb,4,8);
+ALPHANUMMARKER(lb,4,9);
+
+ALPHANUMMARKER(lb,5,A);
+ALPHANUMMARKER(lb,5,B);
+ALPHANUMMARKER(lb,5,C);
+ALPHANUMMARKER(lb,5,D);
+ALPHANUMMARKER(lb,5,E);
+ALPHANUMMARKER(lb,5,F);
+ALPHANUMMARKER(lb,5,G);
+ALPHANUMMARKER(lb,5,H);
+ALPHANUMMARKER(lb,5,I);
+ALPHANUMMARKER(lb,5,J);
+ALPHANUMMARKER(lb,5,K);
+ALPHANUMMARKER(lb,5,L);
+ALPHANUMMARKER(lb,5,M);
+ALPHANUMMARKER(lb,5,N);
+ALPHANUMMARKER(lb,5,O);
+ALPHANUMMARKER(lb,5,P);
+ALPHANUMMARKER(lb,5,Q);
+ALPHANUMMARKER(lb,5,R);
+ALPHANUMMARKER(lb,5,S);
+ALPHANUMMARKER(lb,5,T);
+ALPHANUMMARKER(lb,5,U);
+ALPHANUMMARKER(lb,5,V);
+ALPHANUMMARKER(lb,5,W);
+ALPHANUMMARKER(lb,5,X);
+ALPHANUMMARKER(lb,5,Y);
+ALPHANUMMARKER(lb,5,Z);
+ALPHANUMMARKER(lb,5,0);
+ALPHANUMMARKER(lb,5,1);
+ALPHANUMMARKER(lb,5,2);
+ALPHANUMMARKER(lb,5,3);
+ALPHANUMMARKER(lb,5,4);
+ALPHANUMMARKER(lb,5,5);
+ALPHANUMMARKER(lb,5,6);
+ALPHANUMMARKER(lb,5,7);
+ALPHANUMMARKER(lb,5,8);
+ALPHANUMMARKER(lb,5,9);
+