Merge branch 'master' into explosives-refactor

Author: PabstMirror

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
-	"files.exclude": {
-		"**/.hemttout": true,
-		"**/include": true,
-		"**/extras": true
-	}
-}
+    "files.exclude": {
+        "**/.hemttout": true,
+        "**/include": true,
+        "**/extras": true
+    },
+    "files.insertFinalNewline": true
+}

AUTHORS.txt

@@ -169,6 +169,7 @@ rakowozz
 ramius86 <pasini86@hotmail.com>
 Raspu86
 RcINS
+Redwan S. / Nomas <nomasx2000@gmail.com>
 Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
 ruPaladin <happyworm24@rambler.ru>
@@ -179,6 +180,7 @@ Seb <sebsmith90@gmail.com>
 shukari
 simon84 <badguy360th@gmail.com>
 Skengman2
+Sky / Esmeray6
 Smith <smitt14ua@gmail.com>
 Sniperwolf572 <tenga6@gmail.com>
 System98

addons/advanced_fatigue/functions/fnc_addDutyFactor.sqf

@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Factor ID <STRING>
- * 1: Factor <NUMBER> or <CODE>
+ * 1: Factor <NUMBER or CODE>
  *
  * Return Value:
  * None

addons/ai/functions/fnc_garrison.sqf

@@ -4,7 +4,7 @@
  * Garrison function used to garrison AI inside buildings.
  *
  * Arguments:
- * 0: The building(s) nearest this position are used <POSITION>
+ * 0: The building(s) nearest this position are used <ARRAY>
  * 1: Limit the building search to those type of building <ARRAY>
  * 2: Units that will be garrisoned <ARRAY>
  * 3: Radius to fill building(s) <NUMBER> (default: 50)

addons/ai/functions/fnc_garrisonMove.sqf

@@ -5,8 +5,8 @@
  *
  * Arguments:
  * 0: Array of arrays <ARRAY>
- *    0: Unit needing to be placed <UNIT>
- *    1: Position the unit need to be placed at <POSITION>
+ *    0: Unit needing to be placed <OBJECT>
+ *    1: Position the unit need to be placed at <ARRAY>
  *
  * Return Value:
  * Nothing

addons/aircraft/RscInGameUI.hpp

@@ -5,8 +5,6 @@ class RscPicture;
 class RscOpticsText;
 class RscIGProgress;
 class RscOpticsValue;
-class VScrollbar;
-class HScrollbar;
 class RscLadderPicture;
 class RscControlsGroupNoScrollbars;
 
@@ -16,19 +14,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"CA_IGUI_elements_group", "CA_VehicleToggles"};
 
-        class VScrollbar;
-        class HScrollbar;
-        class CA_IGUI_elements_group: RscControlsGroup {
+        class CA_IGUI_elements_group: RscControlsGroupNoScrollbars {
             idc = 170;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
-
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";
@@ -177,17 +165,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"CA_Zeroing", "CA_IGUI_elements_group", "CA_VehicleToggles"};
 
-        class CA_IGUI_elements_group: RscControlsGroup {
+        class CA_IGUI_elements_group: RscControlsGroupNoScrollbars {
             idc = 170;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
-
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";
@@ -360,16 +340,9 @@ class RscInGameUI {
         idd = 300;
         controls[] = {"WeaponInfoControlsGroupRight", "CA_BackgroundVehicle", "CA_BackgroundVehicleTitle", "CA_BackgroundVehicleTitleDark", "CA_BackgroundFuel", "CA_Vehicle", "CA_VehicleRole", "CA_HitZones", "CA_SpeedBackground", "CA_SpeedUnits", "CA_Speed", "CA_ValueFuel", "CA_AltBackground", "CA_AltUnits", "CA_Alt", "CA_VehicleToggles", "CA_Radar", "DriverOpticsGroup"};
 
-        class DriverOpticsGroup: RscControlsGroup {
+        class DriverOpticsGroup: RscControlsGroupNoScrollbars {
             idc = 392;
 
-            class VScrollbar: VScrollbar {
-                width = 0;
-            };
-
-            class HScrollbar: HScrollbar {
-                height = 0;
-            };
             x = "0 * (0.01875 * SafezoneH) + (SafezoneX + ((SafezoneW - SafezoneH) / 2))";
             y = "0 * (0.025 * SafezoneH) + (SafezoneY)";
             w = "53.5 * (0.01875 * SafezoneH)";

addons/apl/data/csw_tow_merge.rvmat

@@ -29,4 +29,4 @@ class Stage2
 		dir[]={0.000000,0.000000,0.000000};
 		pos[]={0.000000,0.000000,0.000000};
 	};
-};
+};

addons/apl/data/glass_house.rvmat

@@ -1 +1 @@
-surfaceInfo="z\ace\addons\apl\data\glass_House.bisurf";
+surfaceInfo="z\ace\addons\apl\data\glass_House.bisurf";

addons/apl/data/plastic.rvmat

@@ -1,4 +1,4 @@
 surfaceInfo="z\ace\addons\apl\data\plastic.bisurf";
 
 diffuse[]={0.5,0.5,1.0,1.000000};
-ambient[]={0.5,0.5,1.0,1.000000};
+ambient[]={0.5,0.5,1.0,1.000000};

addons/arsenal/functions/fnc_addAction.sqf

@@ -8,13 +8,13 @@
  * 0: Tabs to add action to <ARRAY>
  * 1: Action class (unique string for each action) <STRING>
  * 2: Title <STRING>
- * 3: Actions <ARRAY of ARRAYS>
+ * 3: Actions <ARRAY of ARRAYs>
  * 4: Condition <CODE> (default: {true})
  * 5: Scope editor <NUMBER> (default: 2)
  * 6: Update when cargo content changes <BOOL> (default: false)
  *
  * Return Value:
- * 0: Array of IDs <ARRAY of STRINGS>
+ * 0: Array of IDs <ARRAY of STRINGs>
  *
  * Example:
  *  [[0, 5], "TAG_myActions", "My Actions", [