Merge branch 'master' into medical-rewrite

Conflicts:
	addons/medical/stringtable.xml

README.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.9.0-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.9.1-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

addons/cookoff/stringtable.xml

@@ -63,10 +63,14 @@
         </Key>
         <Key ID="STR_ACE_CookOff_ammoCookoffDuration_name">
             <English>Ammunition cook off duration</English>
+            <Polish>Czas trwania samozapłonu amunicji</Polish>
+            <Japanese>弾薬の誘爆持続時間</Japanese>
         </Key>
         <Key ID="STR_ACE_CookOff_ammoCookoffDuration_tooltip">
             <English>Multiplier for how long cook off lasts [Setting to 0 will disable ammo cookoff]</English>
             <French>Active le et les effets de destructions assosicée aux vehicules.</French>
+            <Polish>Mnożnik decydujący jak długo ma trwać samozapłon amunicji [Ustawienie na 0 spowoduje wyłącznie samozapłonu]</Polish>
+            <Japanese>誘爆の持続時間を乗数で設定。[0 に設定で誘爆を無効化]</Japanese>
         </Key>
     </Package>
 </Project>

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 3
 #define MINOR 9
-#define PATCHLVL 0
+#define PATCHLVL 1
-#define BUILD 16
+#define BUILD 17

addons/medical_menu/stringtable.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Medical Menu">
         <Key ID="STR_ACE_Medical_Menu_OpenMenu">
@@ -305,7 +305,7 @@
             <German>Setze Status auf der Triagekarte</German>
             <Russian>Сортировка</Russian>
             <Spanish>Seleccionar estado de Triage</Spanish>
-            <French>Selectioner l'état de triage</French>
+            <French>Sélectionner l'état de triage</French>
             <Polish>Wybierz priorytet</Polish>
             <Portuguese>Selecionar estado de triagem</Portuguese>
             <Czech>Vybrat prioritu</Czech>
@@ -318,7 +318,7 @@
             <German>Wähle Kopf</German>
             <Russian>Выбрать голову</Russian>
             <Spanish>Seleccionar Cabeza</Spanish>
-            <French>Selectioner la tête</French>
+            <French>Sélectionner la tête</French>
             <Polish>Wybierz głowę</Polish>
             <Portuguese>Selecionar Cabeça</Portuguese>
             <Czech>Vybrat Hlavu</Czech>
@@ -331,7 +331,7 @@
             <German>Wähle Torso</German>
             <Russian>Выбрать торс</Russian>
             <Spanish>Seleccionar Torso</Spanish>
-            <French>Selectioner le torse</French>
+            <French>Sélectionner le torse</French>
             <Polish>Wybierz tors</Polish>
             <Portuguese>Selecionar Torso</Portuguese>
             <Czech>Vybrat Trup</Czech>
@@ -344,7 +344,7 @@
             <German>Wähle linken Arm</German>
             <Russian>Выбрать левую руку</Russian>
             <Spanish>Seleccionar Brazo Izquierdo</Spanish>
-            <French>Selectioner le bras gauche</French>
+            <French>Sélectionner le bras gauche</French>
             <Polish>Wybierz lewą rękę</Polish>
             <Portuguese>Selecionar Braço Esquerdo</Portuguese>
             <Czech>Vybrat Levou ruku</Czech>
@@ -357,7 +357,7 @@
             <German>Wähle rechten Arm</German>
             <Russian>Выбрать правую руку</Russian>
             <Spanish>Seleccionar Brazo Derecho</Spanish>
-            <French>Selectioner le bras droit</French>
+            <French>Sélectionner le bras droit</French>
             <Polish>Wybierz prawą rękę</Polish>
             <Portuguese>Selecionar Braço Direito</Portuguese>
             <Czech>Vybrat Pravou ruku</Czech>
@@ -370,7 +370,7 @@
             <German>Wähle linkes Bein</German>
             <Russian>Выбрать левую ногу</Russian>
             <Spanish>Seleccionar Pierna Izquierda</Spanish>
-            <French>Selectioner la jambe gauche</French>
+            <French>Sélectionner la jambe gauche</French>
             <Polish>Wybierz lewą nogę</Polish>
             <Portuguese>Selecionar Perna Esquerda</Portuguese>
             <Czech>Vybrat Levou nohu</Czech>
@@ -383,7 +383,7 @@
             <German>Wähle rechtes Bein</German>
             <Russian>Выбрать правую ногу</Russian>
             <Spanish>Seleccionar Pierna Derecha</Spanish>
-            <French>Selectioner la jambe droite</French>
+            <French>Sélectionner la jambe droite</French>
             <Polish>Wybierz prawą nogę</Polish>
             <Portuguese>Selecionar Perna Direita</Portuguese>
             <Czech>Vybrat Pravou nohu</Czech>

addons/microdagr/CfgUIGrids.hpp

@@ -0,0 +1,21 @@
+class CfgUIGrids {
+    class IGUI {
+        class Presets {
+            class Arma3 {
+                class Variables {
+                    grid_ACE_microDagr[] = {{"(safezoneX + safezoneW - 11 * (((safezoneW / safezoneH) min 1.2) / 40))","(safezoneY + safezoneH - 15 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))","(10 * (((safezoneW / safezoneH) min 1.2) / 40))","(10 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))"},"(((safezoneW / safezoneH) min 1.2) / 40)","((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)"};
+                };
+            };
+        };
+
+        class Variables {
+            class grid_ACE_microDagr {
+                displayName = COMPONENT_NAME;
+                description = "ACE MicroDagr";
+                preview = QPATHTOF(ui\IGUI_preview_ca.paa);
+                saveToProfile[] = {0,1,2,3};
+                canResize = 1;
+            };
+        };
+    };
+};

addons/microdagr/config.cpp

@@ -18,4 +18,5 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
 #include "gui.hpp"
+#include "CfgUIGrids.hpp"
 #include "ACE_Settings.hpp"

addons/microdagr/gui.hpp

@@ -59,10 +59,10 @@ class GVAR(TheDialog) {
 
 
 //Redfine Scaling for the RscTitle
-#define PROFILE_X (profilenamespace getVariable ['IGUI_GRID_GPS_X', 0])
+#define PROFILE_X (profilenamespace getVariable ['IGUI_grid_ACE_microDagr_X', 0])
-#define PROFILE_Y (profilenamespace getVariable ['IGUI_GRID_GPS_Y', 0])
+#define PROFILE_Y (profilenamespace getVariable ['IGUI_grid_ACE_microDagr_Y', 0])
-#define PROFILE_W (profilenamespace getVariable ['IGUI_GRID_GPS_W', 1])
+#define PROFILE_W (profilenamespace getVariable ['IGUI_grid_ACE_microDagr_W', 1])
-#define PROFILE_H ((16/9) * (profilenamespace getVariable ['IGUI_GRID_GPS_W', 1]))
+#define PROFILE_H ((16/9) * (profilenamespace getVariable ['IGUI_grid_ACE_microDagr_W', 1]))
 
 //Need undef's for pboProject
 #undef X_PART

addons/slideshow/stringtable.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Slideshow">
         <Key ID="STR_ACE_Slideshow_DisplayName">
@@ -141,9 +141,13 @@
         </Key>
         <Key ID="STR_ACE_Slideshow_SetName_DisplayName">
             <English>Set Name</English>
+            <Polish>Ustaw nazwę</Polish>
+            <Japanese>名前設定</Japanese>
         </Key>
         <Key ID="STR_ACE_Slideshow_SetName_Description">
             <English>Name that will be used for main interaction entry (to distinguish multiple slideshows). Default: "Slides"</English>
+            <Polish>Nazwa, która będzie użyta w głównym menu interakcji (w celu rozróżnienia różnych slajdów). Domyślnie: "Slides"</Polish>
+            <Japanese>メイン インタラクション エントリで使われる名前を設定します。(複数のスライドショーを区別するため)。標準: "Slides"</Japanese>
         </Key>
         <Key ID="STR_ACE_Slideshow_Duration_DisplayName">
             <English>Slide Duration</English>

addons/tagging/stringtable.xml

@@ -68,10 +68,7 @@
             <English>Tag</English>
             <German>Markieren</German>
             <Spanish>Marcar</Spanish>
-            <Polish>Taguj</Polish>
-            <French>Tag</French>
             <Polish>Oznakuj</Polish>
-            <French>Marque</French>
             <Italian>Marca</Italian>
             <Czech>Označit</Czech>
             <Portuguese>Marcar</Portuguese>

docs/README_DE.md

@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Version-3.9.0-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.9.1-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Fehlermeldungen">

docs/README_PL.md

@@ -3,7 +3,7 @@
 </p>
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="https://img.shields.io/badge/Wersja-3.9.0-blue.svg?style=flat-square" alt="ACE3 Wersja">
+        <img src="https://img.shields.io/badge/Wersja-3.9.1-blue.svg?style=flat-square" alt="ACE3 Wersja">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?label=Zagadnienia&style=flat-square" alt="ACE3 Zagadnienia">

docs/_config.yml

@@ -9,8 +9,8 @@ ace:
   version:
     major: 3
     minor: 9
-    patch: 0
+    patch: 1
-    build: 16
+    build: 17
 
 acex:
   githubUrl: https://github.com/acemod/ACEX

docs/_config_dev.yml

@@ -11,8 +11,8 @@ ace:
   version:
     major: 3
     minor: 9
-    patch: 0
+    patch: 1
-    build: 16
+    build: 17
 
 acex:
   githubUrl: https://github.com/acemod/ACEX

docs/team.md

@@ -9,7 +9,7 @@ order: 3
 
 Name | Responsibilities
 --- | ---
-[bux](https://github.com/bux578){:target="_blank"} | Scripting, Testing
+[bux](https://github.com/bux){:target="_blank"} | Scripting, Testing
 [Felix Wiegand](https://github.com/koffeinflummi){:target="_blank"} | Scripting, Model Import
 [Glowbal](https://github.com/glowbal){:target="_blank"} | Scripting, UI
 [NouberNou](https://github.com/Noubernou){:target="_blank"} | Coding, Modeling, Performance, SME

docs/wiki/feature/advanced-ballistics.md

@@ -15,7 +15,7 @@ version:
 ## 1. Overview
 The Advanced Ballistics module improves internal and external ballistics.
 
-## 1.1 Features
+### 1.1 Features
 - Drag modelling based on real-world ballistic coefficients.
 - Ambient air density (air pressure, temperature, humidity) affects drag.
 - Wind affects drag and deflects the trajectory.
@@ -31,7 +31,19 @@ The Advanced Ballistics module improves internal and external ballistics.
 
 ## 2. Usage
 
-### 2.1 Protractor
+### 2.1 Enabling Advanced Ballistics
+
+#### 2.1.1 Editor
+<img src="{{ site.baseurl }}/img/wiki/feature/ab_module.jpg" width="799" height="620" alt="Advanced Ballistics module" />
+
+#### 2.1.2 Settings Framework
+- [Settings Framework]({{ site.baseurl }}/wiki/framework/settings-framework.html)
+
+#### 2.1.3 Enabled in-game ?
+- Pick up a [Range Card]({{ site.baseurl }}/wiki/feature/rangecard.html) and open it.
+<img src="{{ site.baseurl }}/img/wiki/feature/ab_ingame.png" width="1400" height="280" alt="Advanced Ballistics vs Default Ballistic" />
+
+### 2.2 Protractor
 - You need a compatible weapon.
 - Press <kbd>Ctrl</kbd>+<kbd>⇧&nbsp;Shift</kbd>+<kbd>K</kbd>.
 - Red line indicates the current inclination angle in degrees.

docs/wiki/feature/atragmx.md

@@ -23,34 +23,34 @@ Horus ATragMX software considers atmospheric conditions, gun data, ammunition, r
 ### 2.1 Example with M14 and default 7.62mm 20Rnd Mag
 
 **Start of the mission:**
- - Open the Range Card and check the cartridge, the zeroed distance, the rifle twist, 
+ - Open the Range Card and check the cartridge, the zeroed distance, the rifle twist, the muzzle velocity at 15°C and the bore height.
-the Muzzle Velocity at 15°C and the Bore Height at the end.
 
- <img src="{{ site.baseurl }}/img/wiki/feature/atragmx1.jpg" width="431" height="600" alt="RangeCard" /> 
+<img src="{{ site.baseurl }}/img/wiki/feature/atragmx1.png" width="1400" height="600" alt="RangeCard" /> 
 
- - Open the AtragMx and the `Atmsphr` column, select `Default` and `Done`.
+ - Open the AtragMx and the `Atmsphr` column, select `Default` and `Done`. (cf manual, p 15)
- - `Open Gun` the 7.62x51mm M80 in the `GunList`.
+ - `Open Gun` the 7.62x51mm M80 in the `GunList`. (cf manual, p 25)
- - Select `E` (English unit) at the top right.
+ - Select `E` (English unit) at the top right. (cf manual, p 10)
  - Open the `Gun` column, check and update the `Bore`, the `Rifle Twist` and `Done`.
  - Select `M` (Metric unit) at the top right.
  - Open the `Gun` column, check and update the `Muzzle Velocity`, the `Zero Range` and `Done`. 
- - *The Muzzle Velocity Table will be automatically updated.*
+ - *The Muzzle Velocity Table will be automatically updated.* (cf manual, p 22)
  - Optionally, `Save Gun` and `Done` in the `GunList`.
  
 **In position:**
- - Update the `Atmsphr` column with the Kestrel and `Done` (Check the new Muzzle Velocity in the `Gun` column).
+ - Update the `Atmsphr` column with the Kestrel and `Done`. (cf manual, p 15)
- - Update the `Target` column.
+ - *Check the new `Muzzle Velocity` in the `Gun` column.*
+ - Update the `Target` column. (cf manual, p 16, 30, 32, 33)
  - Apply the vertical and horizontal elevations on the scope.
  - Control the breath and press.
  
 ### 2.2 Example with Truing tool
  
 **Start of the mission:**
- - Select `Drag Coef Table` in the `Options` menu.
+ - Select `Drag Coef Table` in the `Options` menu. (cf manual, p 22)
  - Add the `ZR` and the `C1` (`Gun` column) in the table and `Done`.
   
 **In position:**
- - Open the `Truing Drop` in the `Options` menu.
+ - Open the `Truing Drop` in the `Options` menu. (cf manual, p 23)
  - Add the actual `Target Range` in the `SUPER` column and `Calc`.
  - Add the same `Target Range` in the `SUB` column  and `Calc`.
  - Apply the actual scope elevation in the `Drop` field and `Calc`.
@@ -63,14 +63,22 @@ the Muzzle Velocity at 15°C and the Bore Height at the end.
  - If a new `Target Range` is applied in the `Target` column, select `Drag Coef Table` in the `Options` menu and `Done`.
  - The ballistic coefficient `C1` and the elevation `Elev` will be recalculated.
  
-<img src="{{ site.baseurl }}/img/wiki/feature/atragmx3.png" width="1123" height="600" alt="Interpolation" />
+ <img src="{{ site.baseurl }}/img/wiki/feature/atragmx3.png" width="1123" height="600" alt="Interpolation" />
 
- ### 3. Official Manual and Horus Videos
+### 2.3 Example with overwritten zero distance
+
+ - The `Default zero distance` can be overwritten with the `Scopes module` or the `serverconfig.hpp`.
+ - In this case, the Range Card will be automatically updated, NOT the AtragMx.
+ - Open the `Gun` column, check and update the `Zero Range` and `Done`.
+ 
+ <img src="{{ site.baseurl }}/img/wiki/feature/atragmx4.png" width="1400" height="600" alt="Default zero distance" />
+ 
+## 3. Official Manual and Horus Videos
  
  - [Official Manual](https://github.com/acemod/ACE3/blob/master/extras/manual_Horus_ATrag-v385.pdf)
  - [Horus video part1](https://www.youtube.com/watch?v=pg6oqT5jVds)
  - [Horus video part2](https://www.youtube.com/watch?v=7SkRnbwoPmw)
  
-### 4. Dependencies
+## 4. Dependencies
 
 {% include dependencies_list.md component="atragmx" %}

docs/wiki/feature/kestrel4500.md

@@ -12,21 +12,45 @@ version:
   patch: 0
 ---
 
-## Overview
+## 1. Overview
 
-### Sub-feature 1
+The Kestrel 4500 Pocket Weather Tracker is Kestrel's environmental meter. This is a mini weather station in itself :
-Short description of sub-feature 1.
+- Heading
-
+- Wind direction
-### Sub-feature 2
+- Crosswind
-Short description of sub-feature 2.
+- Headwind
+- Altitude
+- Barometric pressure
+- Wet bulb temperature
+- Relative humidity in %
+- Dewpoint
+- Density altitude
+- Wind chill
+- Temperature °C
+- Time and date
+- Minimum, Maximum and Average values
 
 
-## Usage
+## 2. Usage
 
-Short overview of how to use the feature, e.g. menu options, key bindings,
+### 2.1 Opening the Kestrel
-instructions. May not apply to all modules.
+
+#### 2.1.1 Interaction Menu
+- Open the self interaction menu <kbd>Ctrl</kbd> + <kbd>⊞&nbsp;Win</kbd>
+- Select `Equipment`
+- Select `Open Kestrel 4500`
+
+#### 2.1.2 Custom key
+- `OPTIONS` / `CONTROLS` / `CONFIGURE ADDONS` / `ACE3 Equipment`
+
+#### 2.1.3 Inventory
+<img src="{{ site.baseurl }}/img/wiki/feature/abtools_inventory.png" width="900" height="450" alt="Inventory management" />
 
 
-## Dependencies
+## 3. Official Manual
+- [Official Manual]({{ site.ace.githubUrl }}/blob/master/extras/K4500_Instruction_Manual_English.pdf)
+
+
+## 4. Dependencies
 
 {% include dependencies_list.md component="kestrel4500" %}

docs/wiki/feature/rangecard.md

@@ -16,21 +16,30 @@ version:
 
 Add a range card that updates itself for your weapon and the type of ammo you're using.
 
+
 ## 2. Usage
 
 ### 2.1 Opening the range card
+
+#### 2.1.1 Interaction Menu
 - Open the self interaction menu <kbd>Ctrl</kbd> + <kbd>⊞&nbsp;Win</kbd>
 - Select `Equipment`
 - Select `Open Range Card`
 
+#### 2.1.2 Custom key
+- `OPTIONS` / `CONTROLS` / `CONFIGURE ADDONS` / `ACE3 Equipment`
+
+#### 2.1.3 Inventory
+<img src="{{ site.baseurl }}/img/wiki/feature/abtools_inventory.png" width="900" height="450" alt="Inventory management" />
+
 ### 2.2 Using the range card
-- To use this to it's full potential the use of a `Vector 21` is strongly recommended, a `Kestrel 4500` will also help.
+- To use this to it's full potential the use of a [Vector 21]({{ site.baseurl }}/wiki/feature/vector.html) is strongly recommended, a [Kestrel 4500]({{ site.baseurl }}/wiki/feature/kestrel4500.html) will also help.
-
+- Pull out your rangefinder ([Vector 21]({{ site.baseurl }}/wiki/feature/vector.html) preferred) and get the distance between you and your target.
-- Pull out your rangefinder (`Vector 21` preferred) and get the distance between you and your target.
-
 - Open your rangetable and look under the `Target range` column.
-
 - Move to the `Bullet Drop` column, the drop is in MRADs, you need to compensate for it by adjusting your sight. Example, you want to adjust for a bullet drop of -7.9 MRADs  simply adjust your scope 7.9 MRADs vertically. (check [feature scopes]({{ site.baseurl }}/wiki/feature/scopes.html) ) for this.
+- Possibility to modify, copy and share the range card between spotter and shooter.
+<img src="{{ site.baseurl }}/img/wiki/feature/rangecard_menu.jpg" width="350" height="350" alt="Range card self interaction menu" />
+
 
 ## 3. Dependencies
 

docs/wiki/feature/scopes.md

@@ -17,6 +17,7 @@ version:
 ### Sniper Scope Adjustment
 Allows snipers to adjust their scopes horizontally and vertically in mils.
 
+
 ## 2. Usage
 
 ### 2.1 Adjusting your scope vertically
@@ -32,6 +33,10 @@ Please not that the following key combinations are ACE3 default key binds.
 - Major adjustment right <kbd>Ctrl</kbd> + <kbd>⇧&nbsp;Shift</kbd> + <kbd>Page Up</kbd>.
 - Major adjustment left <kbd>Ctrl</kbd> + <kbd>⇧&nbsp;Shift</kbd> + <kbd>page Down</kbd>.
 
+### 2.3 Scopes Module
+<img src="{{ site.baseurl }}/img/wiki/feature/scope_module.jpg" width="799" height="620" alt="Editor's scopes module" />
+
+
 ## 3. Dependencies
 
 {% include dependencies_list.md component="scopes" %}

mod.cpp

@@ -1,8 +1,8 @@
-name = "Advanced Combat Environment 3.9.0";
+name = "Advanced Combat Environment 3.9.1";
 picture = "logo_ace3_ca.paa";
 actionName = "GitHub";
 action = "https://github.com/acemod/ACE3";
-description = "ACE3 - Version 3.9.0";
+description = "ACE3 - Version 3.9.1";
 logo = "logo_ace3_ca.paa";
 logoOver = "logo_ace3_ca.paa";
 tooltip = "ACE3";