From 8119e87aa01aea9daaac5c67ddc56e3e9e1bc81a Mon Sep 17 00:00:00 2001 From: BaerMitUmlaut Date: Thu, 15 Nov 2018 17:49:43 +0100 Subject: [PATCH 01/11] Fix wind roughness on airports (#6631) --- addons/weather/functions/fnc_calculateRoughnessLength.sqf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/weather/functions/fnc_calculateRoughnessLength.sqf b/addons/weather/functions/fnc_calculateRoughnessLength.sqf index 17519c8092..57723355e8 100644 --- a/addons/weather/functions/fnc_calculateRoughnessLength.sqf +++ b/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 = count (_windSource nearObjects ["Building", 50]); +private _nearBuildings = { + // 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 { From e00723039b0d7d1e2101ed527c0f7aa1e3b0c9bb Mon Sep 17 00:00:00 2001 From: zharf Date: Sat, 17 Nov 2018 05:30:46 +0200 Subject: [PATCH 02/11] Nametags - Adjustable colors settings (#6641) * Move hard coded nametag team colors to settings Also made the default colors lighter to make them easier to read * Added myself to contributors * Fixed Nametag to Name Tag * Optimized array copying * Moved team color settings to color subcategory and used vanilla localization strings * Split a long line into a more readable multiline solution --- AUTHORS.txt | 1 + addons/nametags/ACE_Settings.hpp | 6 +- addons/nametags/XEH_preInit.sqf | 2 + .../functions/fnc_drawNameTagIcon.sqf | 12 +++- addons/nametags/initSettings.sqf | 56 +++++++++++++++++++ 5 files changed, 70 insertions(+), 7 deletions(-) create mode 100644 addons/nametags/initSettings.sqf diff --git a/AUTHORS.txt b/AUTHORS.txt index c3c4d7f12e..05db46c820 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -65,6 +65,7 @@ Drill Dudakov aka [OMCB]Kaban Drofseh Dslyecxi +Eclipser ElTyranos eRazeri evromalarkey diff --git a/addons/nametags/ACE_Settings.hpp b/addons/nametags/ACE_Settings.hpp index 702cba07cd..5b5d7b79cc 100644 --- a/addons/nametags/ACE_Settings.hpp +++ b/addons/nametags/ACE_Settings.hpp @@ -1,10 +1,6 @@ class ACE_Settings { class GVAR(defaultNametagColor) { - value[] = {0.77, 0.51, 0.08, 1}; - typeName = "COLOR"; - isClientSettable = 1; - displayName = CSTRING(DefaultNametagColor); - category = CSTRING(Module_DisplayName); + movedToSQF = 1; }; class GVAR(showPlayerNames) { value = 1; diff --git a/addons/nametags/XEH_preInit.sqf b/addons/nametags/XEH_preInit.sqf index b47cf6628d..9361d05015 100644 --- a/addons/nametags/XEH_preInit.sqf +++ b/addons/nametags/XEH_preInit.sqf @@ -6,4 +6,6 @@ PREP_RECOMPILE_START; #include "XEH_PREP.hpp" PREP_RECOMPILE_END; +#include "initSettings.sqf" + ADDON = true; diff --git a/addons/nametags/functions/fnc_drawNameTagIcon.sqf b/addons/nametags/functions/fnc_drawNameTagIcon.sqf index 093496cfb8..61a8a1b930 100644 --- a/addons/nametags/functions/fnc_drawNameTagIcon.sqf +++ b/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); diff --git a/addons/nametags/initSettings.sqf b/addons/nametags/initSettings.sqf new file mode 100644 index 0000000000..b2cf482ce1 --- /dev/null +++ b/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; From 6f97a4ad39164fdd9d4e9ece0a191cbe6675015f Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 17 Nov 2018 10:11:47 -0600 Subject: [PATCH 03/11] RHS Compats - Update allowSwapBarrels for some guns (#6675) * RHS Compats - Update allowSwapBarrels for some guns Close #6653 * Update comments --- optionals/compat_rhs_afrf3/CfgWeapons.hpp | 1 + optionals/compat_rhs_gref3/CfgWeapons.hpp | 3 +++ optionals/compat_rhs_usf3/CfgWeapons.hpp | 7 ++++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/optionals/compat_rhs_afrf3/CfgWeapons.hpp b/optionals/compat_rhs_afrf3/CfgWeapons.hpp index 742841484d..f09d1cc787 100644 --- a/optionals/compat_rhs_afrf3/CfgWeapons.hpp +++ b/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; }; diff --git a/optionals/compat_rhs_gref3/CfgWeapons.hpp b/optionals/compat_rhs_gref3/CfgWeapons.hpp index f7408af2ba..0d129c21ae 100644 --- a/optionals/compat_rhs_gref3/CfgWeapons.hpp +++ b/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; + }; }; diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp index 190cbadd35..4f270de4b9 100644 --- a/optionals/compat_rhs_usf3/CfgWeapons.hpp +++ b/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 { From 621cd77025821667a86de9a01180f5e63475d455 Mon Sep 17 00:00:00 2001 From: Cyruz143 Date: Sun, 18 Nov 2018 01:13:21 +0000 Subject: [PATCH 04/11] Adding primary fence used on Sarahni --- addons/logistics_wirecutter/script_component.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/logistics_wirecutter/script_component.hpp b/addons/logistics_wirecutter/script_component.hpp index 53efa5908d..ebb703219d 100644 --- a/addons/logistics_wirecutter/script_component.hpp +++ b/addons/logistics_wirecutter/script_component.hpp @@ -53,6 +53,7 @@ "fence.p3d",\ "fort_razorwire.p3d",\ "barbedwire.pd3",\ + "dd_pletivo.p3d",\ "plot_green_draty.p3d"\ ] From 17eed99a9372eb07f4e7db0199ea54651f75486b Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Sun, 18 Nov 2018 12:26:11 +0100 Subject: [PATCH 05/11] Add stale configuration (#6682) * Add stale configuration Add stale bot configuration. Mark anything inactive for >6 months as stale. * Update close comment --- .github/stale.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 0000000000..6a81ed4c6e --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,40 @@ +# 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 + - 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 From 48e81ff45dfac14dfd630ef015a601823ea06ef1 Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Sun, 18 Nov 2018 14:12:03 +0100 Subject: [PATCH 06/11] Ignore focus feature issues (#6687) --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 6a81ed4c6e..de8d73bb26 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -9,6 +9,7 @@ exemptLabels: - impact/large - kind/critical bug - kind/bug + - kind/Focus Feature - status/accepting-pr - status/cherrypick - status/merge on release From 71a206591a498a3a0439417240669c356addb71c Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Sun, 18 Nov 2018 15:42:03 +0100 Subject: [PATCH 07/11] Ignore issues listed in a project or milestone (#6688) --- .github/stale.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/stale.yml b/.github/stale.yml index de8d73bb26..a129b592ad 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -39,3 +39,9 @@ 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 From b8c4329388457c0dfd2cadcb8b82a187a0ba7782 Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Sun, 18 Nov 2018 16:32:01 +0100 Subject: [PATCH 08/11] clean up gibot configuration (#6686) It is no longer used since we enabled stale bot. --- .gibot.yml | 56 ------------------------------------------------------ 1 file changed, 56 deletions(-) delete mode 100644 .gibot.yml diff --git a/.gibot.yml b/.gibot.yml deleted file mode 100644 index b3a565a5e4..0000000000 --- a/.gibot.yml +++ /dev/null @@ -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 From 7ee08fa4c9ca4a6bd9edc001a6782ff434668137 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sun, 18 Nov 2018 16:46:10 +0100 Subject: [PATCH 09/11] Support # command in SQF Validator (quick, will miss missing semi-colons on actual # command) (#6338) --- tools/sqf_validator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sqf_validator.py b/tools/sqf_validator.py index c45f0f94f2..b37b3f2f6d 100644 --- a/tools/sqf_validator.py +++ b/tools/sqf_validator.py @@ -85,7 +85,7 @@ def check_sqf_syntax(filepath): isInString = True inStringType = c elif (c == '#'): - ignoreTillEndOfLine = True + checkForSemiColumn = False elif (c == '/'): checkIfInComment = True elif (c == '('): From e1774a848cb2ee685442e90e8e0cda22fd2b095d Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Sun, 18 Nov 2018 17:10:28 +0100 Subject: [PATCH 10/11] Revert "Support # command in SQF Validator (quick, will miss missing semi-colons on actual # command) (#6338)" (#6689) This reverts commit 7ee08fa4c9ca4a6bd9edc001a6782ff434668137. --- tools/sqf_validator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sqf_validator.py b/tools/sqf_validator.py index b37b3f2f6d..c45f0f94f2 100644 --- a/tools/sqf_validator.py +++ b/tools/sqf_validator.py @@ -85,7 +85,7 @@ def check_sqf_syntax(filepath): isInString = True inStringType = c elif (c == '#'): - checkForSemiColumn = False + ignoreTillEndOfLine = True elif (c == '/'): checkIfInComment = True elif (c == '('): From 69a3ae823ad8904e86f94d2b9750158160a3de6b Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sun, 18 Nov 2018 10:48:12 -0600 Subject: [PATCH 11/11] Wiki - Update feature list for AH9 (#6691) Close #5299 --- docs/wiki/feature/aircraft.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/wiki/feature/aircraft.md b/docs/wiki/feature/aircraft.md index 61e669d644..80d2c658a9 100644 --- a/docs/wiki/feature/aircraft.md +++ b/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