Merge branch 'master' into armake

.gibot.yml

@@ -1,56 +0,0 @@
-stages:
-  mark_for_closing:
-     days: 30
-     labels:
-       - status/need more info
-       - status/invalid
-       - status/can't reproduce
-       - status/wontfix
-     exclude:
-       - status/marked for cleanup
-       - status/accepting-pr
-     comment:
-       - 'Hello @{author}! There has been no activity on this ticket for over a period of {days} days. I am automatically replying to let you know we will close this ticket within 1 week due to inactivity and consider this resolved.'
-       - 'If you believe this is in error, please reply with the requested information.'
-       - 'Thank you. :robot:'
-     action:
-       close: false
-       comment: true
-       assign_label:
-         - status/marked for cleanup
-  clean_up:
-     days: 7
-     labels:
-       - status/marked for cleanup
-     comment:
-       - 'Hello @{author}! We have detected no activity for {days} days on this ticket. We therefore assume that the original reporter has lost interest or the issue has been resolved.'
-       - 'Since we have marked this ticket for deletion, we will be closing it.'
-       - 'If this has been closed in error, please create a comment below and we can reopen this issue. Note that you may need to provide additional information that was requested.'
-       - 'Thank you. :robot:'
-     action:
-       close: true
-       comment: true
-       assign_label:
-         - status/closed by bot
-       remove_label:
-         - status/marked for cleanup
-  remind_about_old_ticket:
-    days: 365
-    labels:
-      - kind/bug
-      - kind/critical bug
-    exclude:
-      - status/need more info
-      - status/invalid
-      - status/can't reproduce
-      - status/wontfix
-      - status/marked for cleanup
-      - status/inactive
-      - status/stale
-      - status/accepting-pr
-    comment:
-      - 'Hello @acemod/maintainers. This ticket has been open for over {days} days without any activity.'
-    action:
-      comment: true
-      assign_label:
-       - status/inactive

.github/stale.yml

@@ -0,0 +1,47 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 180
+
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - impact/large
+  - kind/critical bug
+  - kind/bug
+  - kind/Focus Feature
+  - status/accepting-pr
+  - status/cherrypick
+  - status/merge on release
+  - sticky
+
+# Label to use when marking an issue as stale
+staleLabel: status/stale
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed due to inactivity.
+  
+  If this is still an issue, please feel free to re-open this. If necessary, provide any additional details to help us solve this issue.
+  
+  If you wish to assist us resolving this issue, 
+  please re-open or create a new issue stating you wish to help us out.
+  
+  Thank you for your contributions.
+  
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+only: issues
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true

AUTHORS.txt

@@ -65,6 +65,7 @@ Drill <drill87@gmail.com>
 Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Drofseh <drofseh@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
+Eclipser <jms@modeemi.fi>
 ElTyranos
 eRazeri
 evromalarkey <evromalarkey@gmail.com>

addons/logistics_wirecutter/script_component.hpp

@@ -53,6 +53,7 @@
     "fence.p3d",\
     "fort_razorwire.p3d",\
     "barbedwire.pd3",\
+    "dd_pletivo.p3d",\
     "plot_green_draty.p3d"\
 ]
 

addons/nametags/ACE_Settings.hpp

@@ -1,10 +1,6 @@
 class ACE_Settings {
     class GVAR(defaultNametagColor) {
-        value[] = {0.77, 0.51, 0.08, 1};
+        movedToSQF = 1;
-        typeName = "COLOR";
-        isClientSettable = 1;
-        displayName = CSTRING(DefaultNametagColor);
-        category = CSTRING(Module_DisplayName);
     };
     class GVAR(showPlayerNames) {
         value = 1;

addons/nametags/XEH_preInit.sqf

@@ -6,4 +6,6 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+#include "initSettings.sqf"
+
 ADDON = true;

addons/nametags/functions/fnc_drawNameTagIcon.sqf

@@ -57,10 +57,18 @@ _fnc_parameters = {
     private _color = [1, 1, 1, _alpha];
     if ((group _target) != (group _player)) then {
         _color = +GVAR(defaultNametagColor); //Make a copy, then multiply both alpha values (allows client to decrease alpha in settings)
-        _color set [3, (_color select 3) * _alpha];
     } else {
-        _color = [[1, 1, 1, _alpha], [1, 0, 0, _alpha], [0, 1, 0, _alpha], [0, 0, 1, _alpha], [1, 1, 0, _alpha]] select ((["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find ([assignedTeam _target] param [0, "MAIN"])) max 0);
+        _color = +([
+            GVAR(nametagColorMain),
+            GVAR(nametagColorRed),
+            GVAR(nametagColorGreen),
+            GVAR(nametagColorBlue),
+            GVAR(nametagColorYellow)
+        ] select (
+            (["MAIN", "RED", "GREEN", "BLUE", "YELLOW"] find ([assignedTeam _target] param [0, "MAIN"])) max 0
+        ));
     };
+    _color set [3, (_color select 3) * _alpha];
 
     private _scale = [0.333, 0.5, 0.666, 0.83333, 1] select GVAR(tagSize);
 

addons/nametags/initSettings.sqf

@@ -0,0 +1,56 @@
+// CBA Settings [ADDON: ace_nametags]:
+
+[
+    QGVAR(defaultNametagColor), "COLOR",
+    [LSTRING(DefaultNametagColor)],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [0.77, 0.51, 0.08, 1],
+    false, // isGlobal
+    {[QGVAR(defaultNametagColor), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(nametagColorMain), "COLOR",
+    ["str_team_main"],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [1.00, 1.00, 1.00, 1],
+    false, // isGlobal
+    {[QGVAR(nametagColorMain), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(nametagColorRed), "COLOR",
+    ["str_team_red"],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [1.00, 0.67, 0.67, 1],
+    false, // isGlobal
+    {[QGVAR(nametagColorRed), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(nametagColorGreen), "COLOR",
+    ["str_team_green"],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [0.67, 1.00, 0.67, 1],
+    false, // isGlobal
+    {[QGVAR(nametagColorGreen), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(nametagColorBlue), "COLOR",
+    ["str_team_blue"],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [0.67, 0.67, 1.00, 1],
+    false, // isGlobal
+    {[QGVAR(nametagColorBlue), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;
+
+[
+    QGVAR(nametagColorYellow),
+    "COLOR",
+    ["str_team_yellow"],
+    [format ["ACE %1", localize LSTRING(Module_DisplayName)], localize "str_a3_rscdisplaygameoptions_buttongui"],
+    [1.00, 1.00, 0.67, 1],
+    false, // isGlobal
+    {[QGVAR(nametagColorYellow), _this] call EFUNC(common,cbaSettings_settingChanged)}
+] call CBA_settings_fnc_init;

addons/weather/functions/fnc_calculateRoughnessLength.sqf

@@ -19,8 +19,10 @@
 #define ROUGHNESS_LENGTHS [0.0002, 0.0005, 0.0024, 0.03, 0.055, 0.1, 0.2, 0.4, 0.8, 1.6]
 
 private _windSource = _this vectorDiff ((vectorNormalized wind) vectorMultiply 25);
-
+private _nearBuildings = {
-private _nearBuildings = count (_windSource nearObjects ["Building", 50]);
+    // Filter lights - fixes high roughness on airports (#6602)
+    str _x find "light" == -1
+} count (_windSource nearObjects ["Building", 50]);
 private _isWater = surfaceIsWater _windSource;
 
 if (_nearBuildings == 0 && _isWater) exitWith {

docs/wiki/feature/aircraft.md

@@ -34,9 +34,6 @@ Pilots and copilots of all helicopters can now eject.
 ### 1.6 Laser marker for Wildcat
 Adds a laser marker to the copilot seat of the Wildcat.
 
-### 1.7 HUD for AH-9
-Adds a HUD to the AH-9 based on the Comanche's HUD.
-
 ## 2. Usage
 
 ### 2.1 Switching flare modes

optionals/compat_rhs_afrf3/CfgWeapons.hpp

@@ -64,6 +64,7 @@ class CfgWeapons {
         ACE_barrelLength = 657.86;
     };
     class rhs_weap_pkm: rhs_weap_pkp {
+        ACE_Overheating_allowSwapBarrel = 1;
         ACE_barrelTwist = 240.03;
         ACE_barrelLength = 645.16;
     };

optionals/compat_rhs_gref3/CfgWeapons.hpp

@@ -80,4 +80,7 @@ class CfgWeapons {
     class rhs_weap_mg42_base: Rifle_Base_F {
         ACE_Overheating_allowSwapBarrel = 1;
     };
+    class rhs_weap_m84: Rifle_Long_Base_F { // PKM reskin
+        ACE_Overheating_allowSwapBarrel = 1;
+    };
 };

optionals/compat_rhs_usf3/CfgWeapons.hpp

@@ -70,18 +70,19 @@ class CfgWeapons {
         ACE_barrelTwist = 177.8;
         ACE_barrelLength = 508.0;
     };
-    class rhs_weap_lmg_minimi_railed; // Rifle_Base_F - scope = private;
+    class rhs_weap_saw_base: Rifle_Base_F { // Base class for all Minimi
+        ACE_Overheating_allowSwapBarrel = 1;
+    };
+    class rhs_weap_lmg_minimi_railed;
     class rhs_weap_m249_pip_S: rhs_weap_lmg_minimi_railed {
         ACE_RailHeightAboveBore = 4.11044;
         ACE_barrelLength = 348;
         ACE_barrelTwist = 177.8;
-        ACE_Overheating_allowSwapBarrel = 1;
     };
     class rhs_weap_m249_pip_L: rhs_weap_lmg_minimi_railed {
         ACE_RailHeightAboveBore = 4.34899;
         ACE_barrelLength = 464.8;
         ACE_barrelTwist = 177.8;
-        ACE_Overheating_allowSwapBarrel = 1;
     };
     class rhs_weap_m240_base; // Rifle_Long_Base_F
     class rhs_weap_m240B: rhs_weap_m240_base {