From 84a34387f46e4f102837ea0fae0ceed52e3e969a Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 13:28:01 +0100 Subject: [PATCH 1/6] Update code guidelines for script_component --- docs/wiki/development/coding-guidelines.md | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/wiki/development/coding-guidelines.md b/docs/wiki/development/coding-guidelines.md index 0d2fb64ed39..083036cc885 100644 --- a/docs/wiki/development/coding-guidelines.md +++ b/docs/wiki/development/coding-guidelines.md @@ -168,10 +168,18 @@ The family of path macros define global paths to files for use within a module. ## 3. Functions Functions shall be created in the `functions\` subdirectory, named `fnc_functionName.sqf` They shall then be indexed via the `PREP(functionName)` macro in the `XEH_preInit.sqf` file. -The `PREP` macro allows for CBA function caching, which drastically speeds up load times. **Beware though that function caching is enabled by default and as such to disable it you need to `#define DISABLE_COMPILE_CACHE` above your `#include "script_components.hpp"` include!** +The `PREP` macro allows for CBA function caching, which drastically speeds up load times. **Beware though that function caching is enabled by default and as such to disable it you need to `#define DISABLE_COMPILE_CACHE` above your `#include "script_component.hpp"` include!** -### 3.1 Headers -Every function should have a header of the following format as the start of their function file: +### 3.1 Includes +Every function includes the `script_component.hpp` file on the first line. Any additional includes or defines must be below this include. + +All code written must be below this include and any potential additional includes or defines. + +#### 3.1.1 Reasoning +This ensures every function starts off in an uniform way and enforces function documentation. The include appears before the header to avoid incorrect line numbers in script errors. + +### 3.2 Headers +Every function should have a header of the following format appear before any code: ```js /* @@ -196,15 +204,7 @@ Every function should have a header of the following format as the start of thei */ ``` -This is not the case for inline functions or functions not containing their own file. - -### 3.2 Includes -Every function includes the `script_component.hpp` file just below the function header. Any additional includes or defines must be below this include. - -All scripts written must be below this include and any potential additional includes or defines. - -#### 3.2.1 Reasoning -This ensures every function starts of in an uniform way and enforces function documentation. +This is not the case for inline functions or functions not contained in their own file. ## 4. Global Variables From 0b6977d97e1daf904a3717b1f67bf02b2f2c702d Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 14:03:44 +0100 Subject: [PATCH 2/6] Update contributing documents for pull requests - Reflect true attribution practices - Reflect true merge process (this changed a long time ago) --- README.md | 6 +++--- docs/wiki/development/merging-pull-requests.md | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e62725bc6c8..6d8d5aebaec 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed ## Getting started -ACE3 requires Arma 3 and the latest version of CBA A3. See the following pages for help and information on how to get started with ACE3: +ACE3 requires Arma 3 and the latest version of CBA A3. See the following pages for help and information on how to get started with ACE3: - [Installation guide](https://ace3mod.com/wiki/user/installation-guide.html) - [Information center](https://ace3mod.com/wiki/user/information-center.html) @@ -87,7 +87,7 @@ You can help out with the ongoing development by looking for potential bugs in o ### Contribution guidelines -To contribute something to ACE3, simply fork this repository and submit your pull requests for review by other collaborators. Remember to add yourself to the author array of any PBO you will be editing and the [`AUTHORS.txt`](https://github.com/acemod/ACE3/blob/master/AUTHORS.txt) file; including a valid email address. +To contribute something to ACE3, simply fork this repository and submit your pull requests for review by other collaborators. See [the pull request guidelines](https://ace3mod.com/wiki/development/merging-pull-requests.html) for further information on this process. ### Submitting issues and requesting features @@ -121,7 +121,7 @@ To help us test the latest development changes, download our master branch ([dir Bohemia Forum We have a dedicated thread on the Bohemia Forums for the ACE3 project - + ## License diff --git a/docs/wiki/development/merging-pull-requests.md b/docs/wiki/development/merging-pull-requests.md index 9b7d1022d42..48a0a05ce76 100644 --- a/docs/wiki/development/merging-pull-requests.md +++ b/docs/wiki/development/merging-pull-requests.md @@ -7,14 +7,17 @@ parent: wiki order: 5 --- -This page describes our process of how we merge pull requests. Whereas the main question is: Who's responsible for merging pull requests? +This page describes the process of how we merge pull requests. -All authors must add themselves to the AUTHORS.txt file **with a valid email address**. +All contributors may add themselves to the AUTHORS.txt file (email address optional) if they wish. +The `authors` array property in `config.cpp` files will generally contain the original component author(s) and is otherwise reserved for individuals who have contributed significantly to a component (decided at the discretion of the ACE team). Do not add yourself without consent. -#### Changes to Existing Addons +The `author` string property in `config.cpp` files will always contain the common ACE team string (`ECSTRING(common,ACETeam)`) to reflect component maintanence and keep things consistent. -The people responsible for merging changes to existing addons are the maintainers listed in the README.md file of the respective addon folder. +#### Merge Criteria + +All pull requests must receive approval from a maintainer and must pass all checks (GitHub Actions) before they can be merged. If the changes consist of trivial updates, such as spelling or indentation fixes: @@ -27,8 +30,4 @@ If the changes consist of trivial updates, such as spelling or indentation fixes ...then the PR can be merged right away by one of the maintainers. -Non-trivial pull requests remain open for a minimum of 48 hours, to give all other contributors time to comment on potential issues, and are then merged by a maintainer, should no issues arise. - - -#### New Addons / Other Changes -If a pull request adds a new addon, or changes something else, like the README, everyone has 72 hours to comment on the changes. After that, one of the project leads will merge it. +Non-trivial pull requests should ideally be thouroughly reviewed by multiple maintainers or at least one maintainer highly familiar with any code modified. From 3837598ce04a8df32c3a0628d0eb1b2bb067b972 Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 14:10:43 +0100 Subject: [PATCH 3/6] Remove listed maintainer from component readmes We have almost never used these and serve as a source of confusion for new contributors. --- addons/advanced_ballistics/README.md | 7 ------- addons/advanced_fatigue/README.md | 6 ------ addons/advanced_throwing/README.md | 7 ------- addons/ai/README.md | 8 -------- addons/aircraft/README.md | 9 --------- addons/apl/README.md | 7 ------- addons/artillerytables/README.md | 7 ------- addons/atragmx/README.md | 7 ------- addons/attach/README.md | 10 ---------- addons/backpacks/README.md | 8 -------- addons/ballistics/README.md | 9 --------- addons/captives/README.md | 7 ------- addons/cargo/README.md | 8 -------- addons/chemlights/README.md | 7 ------- addons/common/README.md | 10 ---------- addons/concertina_wire/README.md | 7 ------- addons/csw/README.md | 8 -------- addons/dagr/README.md | 7 ------- addons/disarming/README.md | 9 +-------- addons/disposable/README.md | 8 -------- addons/dogtags/README.md | 8 -------- addons/dragging/README.md | 8 -------- addons/dragon/README.md | 8 -------- addons/explosives/README.md | 8 -------- addons/fastroping/README.md | 6 ------ addons/fcs/README.md | 8 -------- addons/finger/README.md | 8 -------- addons/flashlights/README.md | 7 ------- addons/flashsuppressors/README.md | 8 -------- addons/fonts/README.md | 7 ------- addons/frag/README.md | 8 -------- addons/gestures/README.md | 7 ------- addons/gforces/README.md | 8 -------- addons/goggles/README.md | 8 -------- addons/grenades/README.md | 8 -------- addons/gunbag/README.md | 7 ------- addons/hearing/README.md | 9 --------- addons/hellfire/README.md | 5 ----- addons/hitreactions/README.md | 7 ------- addons/hot/README.md | 8 -------- addons/huntir/README.md | 7 ------- addons/interact_menu/README.md | 8 -------- addons/interaction/README.md | 9 --------- addons/inventory/README.md | 8 -------- addons/javelin/README.md | 8 -------- addons/kestrel4500/README.md | 7 ------- addons/laser/README.md | 10 ---------- addons/laserpointer/README.md | 8 -------- addons/logistics_uavbattery/README.md | 7 ------- addons/logistics_wirecutter/README.md | 7 ------- addons/magazinerepack/README.md | 9 --------- addons/main/README.md | 9 --------- addons/map/README.md | 9 --------- addons/maptools/README.md | 8 -------- addons/markers/README.md | 9 --------- addons/maverick/README.md | 5 ----- addons/medical_ai/README.md | 5 ----- addons/medical_blood/README.md | 6 ------ addons/medical_engine/README.md | 7 ------- addons/medical_gui/README.md | 6 ------ addons/metis/README.md | 8 -------- addons/microdagr/readme.md | 14 ++------------ addons/minedetector/README.md | 6 ------ addons/missileguidance/README.md | 8 -------- addons/missionmodules/README.md | 7 ------- addons/mk6mortar/README.md | 7 ------- addons/modules/README.md | 7 ------- addons/movement/README.md | 8 -------- addons/mx2a/README.md | 7 ------- addons/nametags/README.md | 8 -------- addons/nightvision/README.md | 8 -------- addons/nlaw/README.md | 5 ----- addons/noidle/README.md | 7 ------- addons/noradio/README.md | 8 -------- addons/norearm/README.md | 7 ------- addons/optics/README.md | 7 ------- addons/optionsmenu/README.md | 8 -------- addons/overheating/README.md | 8 -------- addons/overpressure/README.md | 8 -------- addons/parachute/README.md | 8 -------- addons/pylons/README.md | 7 ------- addons/quickmount/README.md | 5 ----- addons/rangecard/README.md | 7 ------- addons/realisticnames/README.md | 8 -------- addons/rearm/README.md | 6 ------ addons/recoil/README.md | 7 ------- addons/refuel/README.md | 6 ------ addons/reload/README.md | 8 -------- addons/reloadlaunchers/README.md | 7 ------- addons/repair/README.md | 9 --------- addons/respawn/README.md | 8 -------- addons/safemode/README.md | 8 -------- addons/sandbag/README.md | 7 ------- addons/scopes/README.md | 9 --------- addons/slideshow/README.md | 7 ------- addons/smallarms/README.md | 8 -------- addons/spectator/README.md | 5 ----- addons/spottingscope/README.md | 7 ------- addons/switchunits/README.md | 8 -------- addons/tacticalladder/README.md | 7 ------- addons/tagging/README.md | 8 -------- addons/thermals/README.md | 8 -------- addons/trenches/README.md | 7 +------ addons/tripod/README.md | 7 ------- addons/ui/README.md | 8 -------- addons/vector/README.md | 8 -------- addons/vehiclelock/readme.md | 5 ----- addons/vehicles/README.md | 8 -------- addons/viewdistance/README.md | 8 -------- addons/weaponselect/README.md | 8 -------- addons/weather/README.md | 9 --------- addons/winddeflection/README.md | 8 -------- addons/yardage450/README.md | 7 ------- addons/zeus/README.md | 7 ------- 114 files changed, 4 insertions(+), 859 deletions(-) diff --git a/addons/advanced_ballistics/README.md b/addons/advanced_ballistics/README.md index 122769b1915..ebd377bab60 100644 --- a/addons/advanced_ballistics/README.md +++ b/addons/advanced_ballistics/README.md @@ -2,10 +2,3 @@ ace_advanced_ballistics =============== The Advanced Ballistics module introduces advanced external- and internal ballistics to the game. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/advanced_fatigue/README.md b/addons/advanced_fatigue/README.md index aec1cfd38b2..46c4aab73f6 100644 --- a/addons/advanced_fatigue/README.md +++ b/addons/advanced_fatigue/README.md @@ -2,9 +2,3 @@ ace_advanced_fatigue ========== An in depth stamina and fatigue simulation. - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [BaerMitUmlaut](https://github.com/BaerMitUmlaut) diff --git a/addons/advanced_throwing/README.md b/addons/advanced_throwing/README.md index eea1c6e3952..bba889d2f71 100644 --- a/addons/advanced_throwing/README.md +++ b/addons/advanced_throwing/README.md @@ -2,10 +2,3 @@ ace_advanced_throwing =================== Integrates advanced throwing by [Dslyecxi](https://github.com/dslyecxi). - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Jonpas](https://github.com/jonpas) diff --git a/addons/ai/README.md b/addons/ai/README.md index e3175b1006e..7757530905a 100644 --- a/addons/ai/README.md +++ b/addons/ai/README.md @@ -2,11 +2,3 @@ ace_ai ====== Overhaul of AI firing modes of vanilla weapons, encouraging the AI to use full-auto and bursts more often. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/aircraft/README.md b/addons/aircraft/README.md index c1bf72b3d7a..20286990d1a 100644 --- a/addons/aircraft/README.md +++ b/addons/aircraft/README.md @@ -4,12 +4,3 @@ ace_aircraft Changes to air weaponry, ejection and HUDs. - Contributions by Kimi (geraldbolso1899) for HUD updates - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) -- [jaynus](https://github.com/walterpearce) diff --git a/addons/apl/README.md b/addons/apl/README.md index 13b5f9d2689..10f826e4a92 100644 --- a/addons/apl/README.md +++ b/addons/apl/README.md @@ -2,10 +2,3 @@ ace_apl ============ Assets licensed under Arma Public License (APL). - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- None diff --git a/addons/artillerytables/README.md b/addons/artillerytables/README.md index 3e52ba9946b..03d7f0ac291 100644 --- a/addons/artillerytables/README.md +++ b/addons/artillerytables/README.md @@ -5,10 +5,3 @@ Universal artillery rangetables. #### Items Added: `ACE_artilleryTable` - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/atragmx/README.md b/addons/atragmx/README.md index 1b685730517..17245373cb8 100644 --- a/addons/atragmx/README.md +++ b/addons/atragmx/README.md @@ -2,10 +2,3 @@ ace_atragmx =============== ATragMX - Handheld ballistics calculator - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/attach/README.md b/addons/attach/README.md index 3bce88839cd..21fa4f1bf6a 100644 --- a/addons/attach/README.md +++ b/addons/attach/README.md @@ -5,13 +5,3 @@ Introducing the ability to attach various throwables to yourself or vehicles, to #### Items Added: `ACE_IR_Strobe_Item` - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [esteldunedain](https://github.com/esteldunedain) -- [bux578](https://github.com/bux578) -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/backpacks/README.md b/addons/backpacks/README.md index 64e37f337bd..58bcb36dbf3 100644 --- a/addons/backpacks/README.md +++ b/addons/backpacks/README.md @@ -2,11 +2,3 @@ ace_backpacks ================= Adds indication when someone else opens your backpack (sound effect and camera shake). - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/ballistics/README.md b/addons/ballistics/README.md index 18d81bceb37..54a7cf5e76f 100644 --- a/addons/ballistics/README.md +++ b/addons/ballistics/README.md @@ -2,12 +2,3 @@ ace_ballistics ============== Changes to weapon, magazine and ammunition values. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/captives/README.md b/addons/captives/README.md index 37c26db159b..eed1408c722 100644 --- a/addons/captives/README.md +++ b/addons/captives/README.md @@ -5,10 +5,3 @@ Adds ability to handcuff and surrender. #### Items Added: `ACE_CableTie` - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/cargo/README.md b/addons/cargo/README.md index eda7079b7bf..e506eda71f7 100644 --- a/addons/cargo/README.md +++ b/addons/cargo/README.md @@ -2,11 +2,3 @@ ace_cargo ============ Adds cargo menu to vehicles and allows loading and unloading of cargo items. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [Glowbal](https://github.com/Glowbal) diff --git a/addons/chemlights/README.md b/addons/chemlights/README.md index a4b734b0d6a..e35737f00c6 100644 --- a/addons/chemlights/README.md +++ b/addons/chemlights/README.md @@ -2,10 +2,3 @@ ace_chemlights ============ Enhances chemlights and makes them more realistic. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [voiper](https://github.com/voiperr) diff --git a/addons/common/README.md b/addons/common/README.md index 04f0eb04c4f..c340967821e 100644 --- a/addons/common/README.md +++ b/addons/common/README.md @@ -2,13 +2,3 @@ ace_common ========== Common functions and systems used by other components. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [NouberNou](https://github.com/NouberNou) -- [commy2](https://github.com/commy2) -- [walterpearce](https://github.com/walterpearce) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/concertina_wire/README.md b/addons/concertina_wire/README.md index e1e6530f5bf..e21a61d2916 100644 --- a/addons/concertina_wire/README.md +++ b/addons/concertina_wire/README.md @@ -2,10 +2,3 @@ ace_concertina_wire =============== Adds concertina wire. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/csw/README.md b/addons/csw/README.md index 8729a7fa31c..b47a978e79d 100644 --- a/addons/csw/README.md +++ b/addons/csw/README.md @@ -2,11 +2,3 @@ ace_csw =============== Crew Served Weapons - Static weapons that are served by multiple people - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [TCVM](https://github.com/TheCandianVendingMachine) - diff --git a/addons/dagr/README.md b/addons/dagr/README.md index eb502e7a246..7de32ecec2a 100644 --- a/addons/dagr/README.md +++ b/addons/dagr/README.md @@ -2,10 +2,3 @@ ace_dagr =============== Adds Defense Advanced GPS Receiver. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/disarming/README.md b/addons/disarming/README.md index 0423aa48bde..bcca67231e3 100644 --- a/addons/disarming/README.md +++ b/addons/disarming/README.md @@ -1,11 +1,4 @@ ace_disarming ============ -Adds ability to make units drop items/weapons/magazines. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) +Adds ability to make units drop items/weapons/magazines. diff --git a/addons/disposable/README.md b/addons/disposable/README.md index b75ecb112dd..d7eee46bc85 100644 --- a/addons/disposable/README.md +++ b/addons/disposable/README.md @@ -2,11 +2,3 @@ ace_disposable ============== Makes the NLAW a disposable one-shot weapon using the [CBA Disposable Framework](https://github.com/CBATeam/CBA_A3/wiki/Disposable-Launchers). - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/dogtags/README.md b/addons/dogtags/README.md index 176b60750d0..da24dd53d48 100644 --- a/addons/dogtags/README.md +++ b/addons/dogtags/README.md @@ -2,11 +2,3 @@ ace_dogtags ========== Adds options to check and take dog tag from dead or unconscious units - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [SzwedzikPL](https://github.com/SzwedzikPL) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/dragging/README.md b/addons/dragging/README.md index b69484eccfa..48a64bbc7ec 100644 --- a/addons/dragging/README.md +++ b/addons/dragging/README.md @@ -2,11 +2,3 @@ ace_dragging ============== Adds ability to drag and carry objects. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Garth "L-H" de Wet](https://github.com/CorruptedHeart) -- [commy2](https://github.com/commy2) diff --git a/addons/dragon/README.md b/addons/dragon/README.md index 84a82ad8202..8b46440b0d4 100644 --- a/addons/dragon/README.md +++ b/addons/dragon/README.md @@ -2,11 +2,3 @@ ace_dragon =================== Adds M47 Dragon Missile. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon-TCVM](https://github.com/TheCandianVendingMachine) - diff --git a/addons/explosives/README.md b/addons/explosives/README.md index 5e85f194270..9f136b6735a 100644 --- a/addons/explosives/README.md +++ b/addons/explosives/README.md @@ -2,11 +2,3 @@ ace_explosives ============== Completely replaces the vanilla explosives system, allowing precise placement and different trigger types. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [CorruptedHeart](https://github.com/CorruptedHeart) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/fastroping/README.md b/addons/fastroping/README.md index 49fcf009604..51b1a41375e 100644 --- a/addons/fastroping/README.md +++ b/addons/fastroping/README.md @@ -3,9 +3,3 @@ ace_fastroping Introducing the ability to fastrope out of heliocopters. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [BaerMitUmlaut](https://github.com/BaerMitUmlaut) -- [KoffeinFlummi](https://github.com/KoffeinFlummi) diff --git a/addons/fcs/README.md b/addons/fcs/README.md index c4abbe32539..abe08d726eb 100644 --- a/addons/fcs/README.md +++ b/addons/fcs/README.md @@ -2,11 +2,3 @@ ace_fcs ======= Adds a fire control system to armoured vehicles and helicopters, allowing precise engagement of stationary and moving targets. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/finger/README.md b/addons/finger/README.md index 6c5d55b7aa3..bfd4ab41539 100644 --- a/addons/finger/README.md +++ b/addons/finger/README.md @@ -2,11 +2,3 @@ ace_finger =========== Allows players to point and show a virtual spot in the distance to nearby players. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Drill](https://github.com/TheDrill/) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/flashlights/README.md b/addons/flashlights/README.md index 6a04b78091e..214dc3dea11 100644 --- a/addons/flashlights/README.md +++ b/addons/flashlights/README.md @@ -2,10 +2,3 @@ ace_flashlights ======= Flashlights for use on map and to attach to player. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [voiper](https://github.com/voiperr) diff --git a/addons/flashsuppressors/README.md b/addons/flashsuppressors/README.md index 29b66420c56..f366b2d821b 100644 --- a/addons/flashsuppressors/README.md +++ b/addons/flashsuppressors/README.md @@ -2,11 +2,3 @@ ace_flashsuppressors ==================== Allows the flash suppressors that are already in the game to be used. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/fonts/README.md b/addons/fonts/README.md index 7e6f704d67f..98e530a75dc 100644 --- a/addons/fonts/README.md +++ b/addons/fonts/README.md @@ -2,10 +2,3 @@ ace_fonts ======== Custom fonts including fixed-width font. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [jaynus](https://github.com/jaynus/) diff --git a/addons/frag/README.md b/addons/frag/README.md index 2bcccda9137..ca62771f00e 100644 --- a/addons/frag/README.md +++ b/addons/frag/README.md @@ -2,11 +2,3 @@ ace_frag ======== Shrapnel system for explosives. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [NouberNou](https://github.com/NouberNou) -- [walterpearce](https://github.com/walterpearce) diff --git a/addons/gestures/README.md b/addons/gestures/README.md index e224ff6d695..cb274c7a851 100644 --- a/addons/gestures/README.md +++ b/addons/gestures/README.md @@ -2,10 +2,3 @@ ace_gestures ======== Gestures system in interaction menu and keybinds. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [jokoho48](https://github.com/jokoho48) diff --git a/addons/gforces/README.md b/addons/gforces/README.md index 15aa7116aa6..a22854006cf 100644 --- a/addons/gforces/README.md +++ b/addons/gforces/README.md @@ -2,11 +2,3 @@ ace_gforces =========== Adds G-force induced tunnel vision and unconsciousness. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/goggles/README.md b/addons/goggles/README.md index 959459f58e3..627e7502975 100644 --- a/addons/goggles/README.md +++ b/addons/goggles/README.md @@ -2,11 +2,3 @@ ace_goggles =========== Adds various effects to different kinds of goggles and ambient effects like dirt thrown up by explosions. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [esteldunedain](https://github.com/esteldunedain) -- [CorruptedHeart](https://github.com/CorruptedHeart) diff --git a/addons/grenades/README.md b/addons/grenades/README.md index c58ac196835..97addb32686 100644 --- a/addons/grenades/README.md +++ b/addons/grenades/README.md @@ -2,11 +2,3 @@ ace_grenades ============ Introduces different throwing modes for grenades, as well as a flashbang and hand flares. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/gunbag/README.md b/addons/gunbag/README.md index 734c18f3c54..2dd0e03bf73 100644 --- a/addons/gunbag/README.md +++ b/addons/gunbag/README.md @@ -2,10 +2,3 @@ ace_gunbag =============== Adds a gunbag for DMRs. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/hearing/README.md b/addons/hearing/README.md index 711a5225598..7655b22e3b0 100644 --- a/addons/hearing/README.md +++ b/addons/hearing/README.md @@ -2,12 +2,3 @@ ace_hearing =========== Introduces combat deafness. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/hellfire/README.md b/addons/hellfire/README.md index bb9eef711e1..b894c0050c6 100644 --- a/addons/hellfire/README.md +++ b/addons/hellfire/README.md @@ -3,8 +3,3 @@ ace_hellfire Adds AGM-114K Hellfire missiles. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/hitreactions/README.md b/addons/hitreactions/README.md index f770470e447..2d69ce0a899 100644 --- a/addons/hitreactions/README.md +++ b/addons/hitreactions/README.md @@ -2,10 +2,3 @@ ace_hitreactions =========== Adds reactions when getting shot. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/hot/README.md b/addons/hot/README.md index 217dfc2f6fb..c94e369c7d8 100644 --- a/addons/hot/README.md +++ b/addons/hot/README.md @@ -2,11 +2,3 @@ ace_hot =================== Adds HOT1/2/3 Missiles - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon-TCVM](https://github.com/TheCandianVendingMachine) - diff --git a/addons/huntir/README.md b/addons/huntir/README.md index b6c8128cbcd..66b837c8d9a 100644 --- a/addons/huntir/README.md +++ b/addons/huntir/README.md @@ -2,10 +2,3 @@ ace_huntir =========== Adds High-altitude Unit Navigated Tactical Imaging Round and its Monitor. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/interact_menu/README.md b/addons/interact_menu/README.md index 77ac2d814ae..d22647f0592 100644 --- a/addons/interact_menu/README.md +++ b/addons/interact_menu/README.md @@ -2,11 +2,3 @@ ace_interact_menu =========== Base framework for interaction menu. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [NouberNou](https://github.com/NouberNou) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/interaction/README.md b/addons/interaction/README.md index 92401b2547f..6a58b15a628 100644 --- a/addons/interaction/README.md +++ b/addons/interaction/README.md @@ -2,12 +2,3 @@ ace_interaction =============== Provides interaction options between units. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/inventory/README.md b/addons/inventory/README.md index 7d644143cf3..7027e5cf521 100644 --- a/addons/inventory/README.md +++ b/addons/inventory/README.md @@ -2,11 +2,3 @@ ace_inventory ============= Adds options to increase the size of the inventory dialog. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/javelin/README.md b/addons/javelin/README.md index ecbf3743b42..cf39b60bd03 100644 --- a/addons/javelin/README.md +++ b/addons/javelin/README.md @@ -2,11 +2,3 @@ ace_javelin =============== Adds the Javelin AT launcher. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [jaynus](https://github.com/walterpearce) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/kestrel4500/README.md b/addons/kestrel4500/README.md index c0b50a3555f..3e4d8a94e22 100644 --- a/addons/kestrel4500/README.md +++ b/addons/kestrel4500/README.md @@ -2,10 +2,3 @@ ace_kestrel4500 =============== Adds Kestrel 4500 Pocket Weather Tracker. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/laser/README.md b/addons/laser/README.md index 64ea8fe045a..a47c15f3a12 100644 --- a/addons/laser/README.md +++ b/addons/laser/README.md @@ -2,13 +2,3 @@ ace_laser ========= Contains various functions necessary for the realistic portrayal of laser mechanics in other components. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [walterpearce](https://github.com/walterpearce) -- [NouberNou](https://github.com/NouberNou) -- [esteldunedain](https://github.com/esteldunedain) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/laserpointer/README.md b/addons/laserpointer/README.md index f4e711513b6..22d2eadf433 100644 --- a/addons/laserpointer/README.md +++ b/addons/laserpointer/README.md @@ -2,11 +2,3 @@ ace_laserpointer ================ Adds a laser pointer visible during the day. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/logistics_uavbattery/README.md b/addons/logistics_uavbattery/README.md index d32175cb447..fbab339fd9a 100644 --- a/addons/logistics_uavbattery/README.md +++ b/addons/logistics_uavbattery/README.md @@ -5,10 +5,3 @@ Adds an item that allows refueling/recharging of the Darter quadcopter UAVs. #### Items Added: `ACE_UAVBattery` - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/logistics_wirecutter/README.md b/addons/logistics_wirecutter/README.md index b40242cd86f..32a33c93379 100644 --- a/addons/logistics_wirecutter/README.md +++ b/addons/logistics_wirecutter/README.md @@ -5,10 +5,3 @@ Adds an item that allows cutting of fences in Arma 3 and AiA/CUP maps. #### Items Added: `ACE_wirecutter` - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/magazinerepack/README.md b/addons/magazinerepack/README.md index e86adcd976c..948188f328c 100644 --- a/addons/magazinerepack/README.md +++ b/addons/magazinerepack/README.md @@ -2,12 +2,3 @@ ace_magazinerepack ================== Adds the ability to consolidate multiple unfull magazines. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/main/README.md b/addons/main/README.md index aa401a81fa9..a3589b2afd4 100644 --- a/addons/main/README.md +++ b/addons/main/README.md @@ -2,12 +2,3 @@ ace_main ======== Backbone of other components, defining most of the commonly used macros. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [walterpearce](https://github.com/walterpearce) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/map/README.md b/addons/map/README.md index 7567986ba50..617bf875a4f 100644 --- a/addons/map/README.md +++ b/addons/map/README.md @@ -7,12 +7,3 @@ Various tweaks to the in-game map, including: - Map shaking while walking (optional) - Map illumination (optional) - Blue Force Tracker (optional) - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [esteldunedain](https://github.com/esteldunedain) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/maptools/README.md b/addons/maptools/README.md index f03474b5c09..a11f57a1a51 100644 --- a/addons/maptools/README.md +++ b/addons/maptools/README.md @@ -5,11 +5,3 @@ Adds the following map tools: - Roamer - Map drawing - Showing GPS on map - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [esteldunedain](https://github.com/esteldunedain) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/markers/README.md b/addons/markers/README.md index aa9538f8bb5..42fbfa29a1a 100644 --- a/addons/markers/README.md +++ b/addons/markers/README.md @@ -2,12 +2,3 @@ ace_markers =========== Completely replaces the default marker system, allowing quicker and more precise placement of markers. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/maverick/README.md b/addons/maverick/README.md index a931a2bc080..313ced8388c 100644 --- a/addons/maverick/README.md +++ b/addons/maverick/README.md @@ -10,8 +10,3 @@ Adds pylon magazines with laser guided AGM-65 Maverick L and KH25ML. ![Laser guided Maverick](https://upload.wikimedia.org/wikipedia/commons/thumb/c/c3/US_Navy_041128-N-5345W-016_Aviation_Ordnanceman_3rd_Class_William_Miller_arms_a_AGM-65_Maverick_laser-guided_missile.jpg/1280px-US_Navy_041128-N-5345W-016_Aviation_Ordnanceman_3rd_Class_William_Miller_arms_a_AGM-65_Maverick_laser-guided_missile.jpg) -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [xrufix](https://github.com/xrufix) diff --git a/addons/medical_ai/README.md b/addons/medical_ai/README.md index db0073b208a..689c18a0313 100644 --- a/addons/medical_ai/README.md +++ b/addons/medical_ai/README.md @@ -3,8 +3,3 @@ ace_medical_ai Makes AI units heal themselves and each other. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [BaerMitUmlaut](https://github.com/BaerMitUmlaut) diff --git a/addons/medical_blood/README.md b/addons/medical_blood/README.md index 848f8f0308c..edc127ee0c7 100644 --- a/addons/medical_blood/README.md +++ b/addons/medical_blood/README.md @@ -3,9 +3,3 @@ ace_medical_blood Creates blood drops on the ground near bleeding units. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) -- [commy2](https://github.com/commy2) diff --git a/addons/medical_engine/README.md b/addons/medical_engine/README.md index c609f506cc5..e3a128d9f42 100644 --- a/addons/medical_engine/README.md +++ b/addons/medical_engine/README.md @@ -2,10 +2,3 @@ ace_medical_engine =============== Links Arma 3 soldier health simulation to ACE medical system. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/medical_gui/README.md b/addons/medical_gui/README.md index 37bd6250fda..71b194c80d4 100644 --- a/addons/medical_gui/README.md +++ b/addons/medical_gui/README.md @@ -3,9 +3,3 @@ ace_medical_gui Implements the interaction menu actions, medical menu, information display, and triage card. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) -- [mharis001](https://github.com/mharis001) diff --git a/addons/metis/README.md b/addons/metis/README.md index c494b9f8f9e..4f735d21a8a 100644 --- a/addons/metis/README.md +++ b/addons/metis/README.md @@ -2,11 +2,3 @@ ace_metis =================== Converts vanilla "Vorona" Missile Guidance into ACE SACLOS Guidance - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Brandon-TCVM](https://github.com/TheCandianVendingMachine) - diff --git a/addons/microdagr/readme.md b/addons/microdagr/readme.md index d7bcf01b40a..befc15da8c1 100644 --- a/addons/microdagr/readme.md +++ b/addons/microdagr/readme.md @@ -1,7 +1,7 @@ ace_microdagr =============== -Adds a MicroDAGR infantry GPS device. +Adds a MicroDAGR infantry GPS device. Press home to open. Then home again to toggle an interactive version. Press CTRL+Home to close. Info/Compass/Minimap modes are selectable by the bottom buttons. Tap the top bar to open the menu and access Mark/Waypoints/Connect To/Settings modes. Tap the minimap button again to toggle map modes (if available). @@ -9,17 +9,7 @@ Enter waypoints from the menu or double tapping on the minimap. Can interface with the `ace_vector`. Hold Azimuth+Range and release (see page 14 of vector's manual) #### Items Added: -`ACE_microDAGR` - - -## For Mission Makers: +`ACE_microDAGR`## For Mission Makers: #### Modules: - MicroDAGR Map Fill - Controls the amount of map data available for the minimap. Can limit to just roads/topographical or disable entirely. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/minedetector/README.md b/addons/minedetector/README.md index 5de79700130..e4607a92c82 100644 --- a/addons/minedetector/README.md +++ b/addons/minedetector/README.md @@ -3,9 +3,3 @@ ace_minedetector Add mine detectors -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) -- [Grey](https://github.com/Grey-Soldierman) diff --git a/addons/missileguidance/README.md b/addons/missileguidance/README.md index bb8047bdf29..b21a5c2408f 100644 --- a/addons/missileguidance/README.md +++ b/addons/missileguidance/README.md @@ -2,11 +2,3 @@ ace_missileguidance =================== Various new modes for different missiles. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [walterpearce](https://github.com/walterpearce) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/missionmodules/README.md b/addons/missionmodules/README.md index 0b8950d3fe9..3389702453e 100644 --- a/addons/missionmodules/README.md +++ b/addons/missionmodules/README.md @@ -2,10 +2,3 @@ ace_missionmodules =========== Adds mission modules. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) diff --git a/addons/mk6mortar/README.md b/addons/mk6mortar/README.md index 072fdf7f157..2c3be4cd970 100644 --- a/addons/mk6mortar/README.md +++ b/addons/mk6mortar/README.md @@ -2,10 +2,3 @@ ace_mk6mortar ========== Tweaks the Mk6 Mortar system. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/modules/README.md b/addons/modules/README.md index b13743b981f..e490449dc3c 100644 --- a/addons/modules/README.md +++ b/addons/modules/README.md @@ -2,10 +2,3 @@ ace_modules =========== Provides framework for module handling. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) diff --git a/addons/movement/README.md b/addons/movement/README.md index 658e4a357a9..abf381552a1 100644 --- a/addons/movement/README.md +++ b/addons/movement/README.md @@ -2,11 +2,3 @@ ace_movement ============ Various tweaks to movement animations. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/mx2a/README.md b/addons/mx2a/README.md index f03edf18497..d3eb8823484 100644 --- a/addons/mx2a/README.md +++ b/addons/mx2a/README.md @@ -2,10 +2,3 @@ ace_mx2a ========== Adds the MX-2A thermal imaging device. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/nametags/README.md b/addons/nametags/README.md index b3ee538ce1e..f659b1d5ed5 100644 --- a/addons/nametags/README.md +++ b/addons/nametags/README.md @@ -2,11 +2,3 @@ ace_nametags ============ Adds nametags above other players to simulate the familiarity with the faces with others one would have in real life. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/nightvision/README.md b/addons/nightvision/README.md index 469d83d9429..85e5c530f08 100644 --- a/addons/nightvision/README.md +++ b/addons/nightvision/README.md @@ -2,11 +2,3 @@ ace_nightvision =============== Adds different types of NVGs with different levels of quality. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/nlaw/README.md b/addons/nlaw/README.md index dd62b360141..2123e79be5f 100644 --- a/addons/nlaw/README.md +++ b/addons/nlaw/README.md @@ -3,8 +3,3 @@ ace_nlaw Adds Predicted Line Of Sight guidance to the NLAW. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/noidle/README.md b/addons/noidle/README.md index 4ea313bd57c..3d6a40ec37e 100644 --- a/addons/noidle/README.md +++ b/addons/noidle/README.md @@ -2,10 +2,3 @@ ace_noidle =========== Removes idle animations. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/noradio/README.md b/addons/noradio/README.md index 95abf72b6f2..98a2fb5c663 100644 --- a/addons/noradio/README.md +++ b/addons/noradio/README.md @@ -2,11 +2,3 @@ ace_noradio =========== Disables the automatic callouts for player units. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [bux578](https://github.com/bux578) diff --git a/addons/norearm/README.md b/addons/norearm/README.md index f0035e57499..f83eea021bf 100644 --- a/addons/norearm/README.md +++ b/addons/norearm/README.md @@ -2,10 +2,3 @@ ace_norearm =========== Removes rearm action. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/optics/README.md b/addons/optics/README.md index a5224267b7e..da4acac5676 100644 --- a/addons/optics/README.md +++ b/addons/optics/README.md @@ -2,10 +2,3 @@ ace_optics =============== Adds animated 2D and PiP (picture-in-picture) optics. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/optionsmenu/README.md b/addons/optionsmenu/README.md index e2742290531..02977228c89 100644 --- a/addons/optionsmenu/README.md +++ b/addons/optionsmenu/README.md @@ -3,11 +3,3 @@ ace_optionsmenu Previously held the options menu. Now just handles version display on main menu and debug/headbug on options menu. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) -- [NouberNou](https://github.com/NouberNou) diff --git a/addons/overheating/README.md b/addons/overheating/README.md index fa18f9dc208..181f6bcc089 100644 --- a/addons/overheating/README.md +++ b/addons/overheating/README.md @@ -2,11 +2,3 @@ ace_overheating =============== Introduces weapon overheating and jamming, as well as the ability to swap the barrel on some weapons. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/overpressure/README.md b/addons/overpressure/README.md index fce4db7d3f3..d79899a8d07 100644 --- a/addons/overpressure/README.md +++ b/addons/overpressure/README.md @@ -2,11 +2,3 @@ ace_overpressure ============= Adds backblast area to AT launchers and overpressure zones to tank cannons. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [KoffeinFlummi](https://github.com/KoffeinFlummi) diff --git a/addons/parachute/README.md b/addons/parachute/README.md index 3dd26081523..5bb3fd00503 100644 --- a/addons/parachute/README.md +++ b/addons/parachute/README.md @@ -2,11 +2,3 @@ ace_parachute =========== Improves parachutes and adds an altimeter. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [CorruptedHeart](https://github.com/CorruptedHeart) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/pylons/README.md b/addons/pylons/README.md index b2b6d9d0643..bbca9d7e2bd 100644 --- a/addons/pylons/README.md +++ b/addons/pylons/README.md @@ -2,10 +2,3 @@ ace_pylons ============ Adds an interface that allows players to configure aircraft pylons. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [654wak654](https://github.com/654wak654) diff --git a/addons/quickmount/README.md b/addons/quickmount/README.md index 6e11fc8ae41..5b2a69f3032 100644 --- a/addons/quickmount/README.md +++ b/addons/quickmount/README.md @@ -2,8 +2,3 @@ ace_quickmount ============ Adds a keybind to quickly enter the vehicle you are directly looking at. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Kingsley](https://github.com/jameslkingsley) diff --git a/addons/rangecard/README.md b/addons/rangecard/README.md index 94169a3075e..26046fc79a4 100644 --- a/addons/rangecard/README.md +++ b/addons/rangecard/README.md @@ -2,10 +2,3 @@ ace_rangecards =============== Adds range cards. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/realisticnames/README.md b/addons/realisticnames/README.md index 6cd05351f6a..a22849cb35c 100644 --- a/addons/realisticnames/README.md +++ b/addons/realisticnames/README.md @@ -2,11 +2,3 @@ ace_realisticnames ================== Changes the names of various weapons and vehicles to those of their real life counterparts. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/rearm/README.md b/addons/rearm/README.md index 4d6dc966a18..010e9cf5261 100644 --- a/addons/rearm/README.md +++ b/addons/rearm/README.md @@ -3,9 +3,3 @@ ace_rearm The Rearm module introduces ability to rearm vehicles on different realistic levels. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [GitHawk] (https://github.com/GitHawk) -- [Jonpas] (https://github.com/jonpas) diff --git a/addons/recoil/README.md b/addons/recoil/README.md index 0c81cde34a3..e6193e3f855 100644 --- a/addons/recoil/README.md +++ b/addons/recoil/README.md @@ -2,10 +2,3 @@ ace_recoil =========== Tweaks weapon recoils and adds camera shake. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/refuel/README.md b/addons/refuel/README.md index 6e3d226693a..96d3a35914e 100644 --- a/addons/refuel/README.md +++ b/addons/refuel/README.md @@ -3,9 +3,3 @@ ace_refuel The Refuel module introduces ability to refuel vehicles on different realistic levels. -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [GitHawk] (https://github.com/GitHawk) -- [Jonpas] (https://github.com/jonpas) diff --git a/addons/reload/README.md b/addons/reload/README.md index 6eca14fdd74..4e8031265e5 100644 --- a/addons/reload/README.md +++ b/addons/reload/README.md @@ -2,11 +2,3 @@ ace_reload ========== Hides the default reload indicators, making it necessary to manually check your magazine. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/reloadlaunchers/README.md b/addons/reloadlaunchers/README.md index 2b6357200bb..67b047772a7 100644 --- a/addons/reloadlaunchers/README.md +++ b/addons/reloadlaunchers/README.md @@ -2,10 +2,3 @@ ace_reloadlaunchers =========== Add the ability to reload someone else's launcher. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) diff --git a/addons/repair/README.md b/addons/repair/README.md index 5cf5e8f89a8..28762b44acf 100644 --- a/addons/repair/README.md +++ b/addons/repair/README.md @@ -2,12 +2,3 @@ ace_repair =========== Adds repair system. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [Glowbal](https://github.com/Glowbal) -- [Jonpas](https://github.com/jonpas) diff --git a/addons/respawn/README.md b/addons/respawn/README.md index 1a9bcfe49ff..753114be991 100644 --- a/addons/respawn/README.md +++ b/addons/respawn/README.md @@ -2,11 +2,3 @@ ace_respawn =========== Various module options to help mission makers to quickly set up various respawn configurations. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [bux578](https://github.com/bux578) diff --git a/addons/safemode/README.md b/addons/safemode/README.md index 9c0632f7be6..27a6d7170e0 100644 --- a/addons/safemode/README.md +++ b/addons/safemode/README.md @@ -2,11 +2,3 @@ ace_safemode ============ Adds the ability to use the safety on small arms. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/sandbag/README.md b/addons/sandbag/README.md index e1bd40eee50..561a6d2bfce 100644 --- a/addons/sandbag/README.md +++ b/addons/sandbag/README.md @@ -2,10 +2,3 @@ ace_sandbag =============== Adds stackable sandbags. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/scopes/README.md b/addons/scopes/README.md index 9ef4c8fa63b..d3261e186fe 100644 --- a/addons/scopes/README.md +++ b/addons/scopes/README.md @@ -2,12 +2,3 @@ ace_scopes ========== Adds adjustable turrets for long-range optics, allowing zeroing in steps of 0.1 MILs. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) -- [bux578](https://github.com/bux578) diff --git a/addons/slideshow/README.md b/addons/slideshow/README.md index 627e1fe6609..e2161374a9e 100644 --- a/addons/slideshow/README.md +++ b/addons/slideshow/README.md @@ -2,10 +2,3 @@ ace_slideshow =============== Adds ability to have slide-shows on them and control them with a controller (another object). - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Jonpas](https://github.com/jonpas) diff --git a/addons/smallarms/README.md b/addons/smallarms/README.md index 0a62e1dbccb..324b8c544a7 100644 --- a/addons/smallarms/README.md +++ b/addons/smallarms/README.md @@ -2,11 +2,3 @@ ace_smallarms ============= Tweaks various config values for small arms, improving values like ROF. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/spectator/README.md b/addons/spectator/README.md index b827bdcc493..17d0c7b1f52 100644 --- a/addons/spectator/README.md +++ b/addons/spectator/README.md @@ -7,8 +7,3 @@ Includes a public API for integration into custom respawn frameworks and a templ For more information, see: http://ace3mod.com/wiki/feature/spectator.html -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [SilentSpike](https://github.com/SilentSpike) diff --git a/addons/spottingscope/README.md b/addons/spottingscope/README.md index a07b9c6c85e..8cd42e45acd 100644 --- a/addons/spottingscope/README.md +++ b/addons/spottingscope/README.md @@ -2,10 +2,3 @@ ace_spottingscope =============== Adds a spotting scope. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/switchunits/README.md b/addons/switchunits/README.md index 029dfc7cf9b..07a29a8665b 100644 --- a/addons/switchunits/README.md +++ b/addons/switchunits/README.md @@ -2,11 +2,3 @@ ace_switchunits =============== Adds insurgency-style unit switching. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [bux578](https://github.com/bux578) -- [commy2](https://github.com/commy2) diff --git a/addons/tacticalladder/README.md b/addons/tacticalladder/README.md index c4b84b16135..8dab8141c1d 100644 --- a/addons/tacticalladder/README.md +++ b/addons/tacticalladder/README.md @@ -2,10 +2,3 @@ ace_tacticalladder =============== Adds a packable tactical ladder. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/tagging/README.md b/addons/tagging/README.md index 1e41cb0c2dd..675da9d7557 100644 --- a/addons/tagging/README.md +++ b/addons/tagging/README.md @@ -2,11 +2,3 @@ ace_tagging =============== Adds a can of spray paint which allows you to tag buildings, walls and other static objects. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [BaerMitUmlaut](https://github.com/BaerMitUmlaut) -- [Jonpas](https://github.com/jonpas) diff --git a/addons/thermals/README.md b/addons/thermals/README.md index edec6451640..7fc50b3e26c 100644 --- a/addons/thermals/README.md +++ b/addons/thermals/README.md @@ -2,11 +2,3 @@ ace_thermals ============ Improves the thermal properties of humans. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/trenches/README.md b/addons/trenches/README.md index 8b4a0d7a368..0d33527da43 100644 --- a/addons/trenches/README.md +++ b/addons/trenches/README.md @@ -6,7 +6,7 @@ Adds 2 trenches; Envelope - Small & Envelop - Big ### Whitelist surfaces for digging Single surfaces can be whitelisted by adding `ACE_canDig = 1` into `CfgSurfaces`. -Example: +Example: ```cpp class CfgSurfaces { class myAwesomeSurface { @@ -15,8 +15,3 @@ class CfgSurfaces { }; ``` -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Grey](https://github.com/Grey-Soldierman) diff --git a/addons/tripod/README.md b/addons/tripod/README.md index beb6791b6d5..a0483c863e1 100644 --- a/addons/tripod/README.md +++ b/addons/tripod/README.md @@ -2,10 +2,3 @@ ace_tripod =============== Adds a packable tripod. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/ui/README.md b/addons/ui/README.md index c55ffbc5c71..8e0c610778a 100644 --- a/addons/ui/README.md +++ b/addons/ui/README.md @@ -2,11 +2,3 @@ ace_ui ======= Removes vignette, changes the chat contrast on the map to allow easier reading and provides settings to hide or show different UI elements. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [VKing](https://github.com/VKing6) -- [Jonpas](https://github.com/jonpas) diff --git a/addons/vector/README.md b/addons/vector/README.md index 8907a78e495..9281e9ee34b 100644 --- a/addons/vector/README.md +++ b/addons/vector/README.md @@ -2,11 +2,3 @@ ace_vector ========== Adds the Vector rangefinder including all modes found in its real counterpart. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/vehiclelock/readme.md b/addons/vehiclelock/readme.md index 64ae01a99c3..85923203cb1 100644 --- a/addons/vehiclelock/readme.md +++ b/addons/vehiclelock/readme.md @@ -33,8 +33,3 @@ Two key modes (can be used together): #### Public Functions: `[bob, car1, true] call ACE_VehicleLock_fnc_addKeyForVehicle;` - will add a `ACE_key_customKeyMagazine` to bob and program it to work on car1 -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [PabstMirror](https://github.com/PabstMirror) diff --git a/addons/vehicles/README.md b/addons/vehicles/README.md index fe26f297df5..a84b558a675 100644 --- a/addons/vehicles/README.md +++ b/addons/vehicles/README.md @@ -2,11 +2,3 @@ ace_vehicles ============ Various tweaks to vehicle and vehicle weapon configs. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/viewdistance/README.md b/addons/viewdistance/README.md index 2f0b14dbeb5..f76d5c4e50a 100644 --- a/addons/viewdistance/README.md +++ b/addons/viewdistance/README.md @@ -2,11 +2,3 @@ ace_viewdistance =========== Adds various View Distance settings, including Field of View based Object View Distance, and allows limiting maximum view distance that can be set by players. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Winter](https://github.com/Winter259) -- [Jonpas](https://github.com/jonpas) diff --git a/addons/weaponselect/README.md b/addons/weaponselect/README.md index 2292140816f..417fc3c3fa7 100644 --- a/addons/weaponselect/README.md +++ b/addons/weaponselect/README.md @@ -2,11 +2,3 @@ ace_weaponselect ================ Adds the ability to quickly select weapons using the number keys. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) diff --git a/addons/weather/README.md b/addons/weather/README.md index da83f62fd2a..62572a878d2 100644 --- a/addons/weather/README.md +++ b/addons/weather/README.md @@ -3,12 +3,3 @@ ace_weather This module simulates realistic weather effects, according to the geographical location of the map, the date and time. It also ensures that all players experience the same weather effects. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [commy2](https://github.com/commy2) -- [esteldunedain](https://github.com/esteldunedain) -- [walterpearce](https://github.com/walterpearce) diff --git a/addons/winddeflection/README.md b/addons/winddeflection/README.md index 926b9577150..bfa86b83f15 100644 --- a/addons/winddeflection/README.md +++ b/addons/winddeflection/README.md @@ -2,11 +2,3 @@ ace_winddeflection =============== Wind deflection for projectiles/bullets. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Glowbal](https://github.com/Glowbal) -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/yardage450/README.md b/addons/yardage450/README.md index 991c4f8a22b..cce219eb33d 100644 --- a/addons/yardage450/README.md +++ b/addons/yardage450/README.md @@ -2,10 +2,3 @@ ace_yardage450 ========== Adds the Bushnell Yardage Pro Sport 450 Laser Rangefinder. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [Ruthberg](http://github.com/Ulteq) diff --git a/addons/zeus/README.md b/addons/zeus/README.md index 35e7da1cdd0..4846a82f80f 100644 --- a/addons/zeus/README.md +++ b/addons/zeus/README.md @@ -7,10 +7,3 @@ Provides control over various aspects of Zeus: - Wind sounds - Ordnance radio messages - Mine markers - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [SilentSpike](http://github.com/SilentSpike) From f84f3b85d311623365d23a05b121a2444432ffdc Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 14:15:31 +0100 Subject: [PATCH 4/6] Fix microDAGR readme Caught in a bad regex --- addons/microdagr/readme.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/microdagr/readme.md b/addons/microdagr/readme.md index befc15da8c1..e85159f23dd 100644 --- a/addons/microdagr/readme.md +++ b/addons/microdagr/readme.md @@ -9,7 +9,9 @@ Enter waypoints from the menu or double tapping on the minimap. Can interface with the `ace_vector`. Hold Azimuth+Range and release (see page 14 of vector's manual) #### Items Added: -`ACE_microDAGR`## For Mission Makers: +`ACE_microDAGR` + +## For Mission Makers: #### Modules: - MicroDAGR Map Fill - Controls the amount of map data available for the minimap. Can limit to just roads/topographical or disable entirely. From 3b0a4ed33967883b5c10b72837c798747c61cdff Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 14:30:48 +0100 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: jonpas --- docs/wiki/development/merging-pull-requests.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/wiki/development/merging-pull-requests.md b/docs/wiki/development/merging-pull-requests.md index 48a0a05ce76..8d53533f7b0 100644 --- a/docs/wiki/development/merging-pull-requests.md +++ b/docs/wiki/development/merging-pull-requests.md @@ -9,7 +9,7 @@ order: 5 This page describes the process of how we merge pull requests. -All contributors may add themselves to the AUTHORS.txt file (email address optional) if they wish. +All contributors may add themselves to the `AUTHORS.txt` file (email address optional) if they wish. The `authors` array property in `config.cpp` files will generally contain the original component author(s) and is otherwise reserved for individuals who have contributed significantly to a component (decided at the discretion of the ACE team). Do not add yourself without consent. @@ -17,7 +17,7 @@ The `author` string property in `config.cpp` files will always contain the commo #### Merge Criteria -All pull requests must receive approval from a maintainer and must pass all checks (GitHub Actions) before they can be merged. +All pull requests must receive approval from a maintainer and must pass all required continuous integration checks before they can be merged. If the changes consist of trivial updates, such as spelling or indentation fixes: From 6e48f3150f57231c684c4777f2149bb3f68745c3 Mon Sep 17 00:00:00 2001 From: Kyle Mckay <5459452+kymckay@users.noreply.github.com> Date: Mon, 16 Aug 2021 17:22:41 +0100 Subject: [PATCH 6/6] Fix typo --- docs/wiki/development/merging-pull-requests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/wiki/development/merging-pull-requests.md b/docs/wiki/development/merging-pull-requests.md index 8d53533f7b0..9c853706d0b 100644 --- a/docs/wiki/development/merging-pull-requests.md +++ b/docs/wiki/development/merging-pull-requests.md @@ -13,7 +13,7 @@ All contributors may add themselves to the `AUTHORS.txt` file (email address opt The `authors` array property in `config.cpp` files will generally contain the original component author(s) and is otherwise reserved for individuals who have contributed significantly to a component (decided at the discretion of the ACE team). Do not add yourself without consent. -The `author` string property in `config.cpp` files will always contain the common ACE team string (`ECSTRING(common,ACETeam)`) to reflect component maintanence and keep things consistent. +The `author` string property in `config.cpp` files will always contain the common ACE team string (`ECSTRING(common,ACETeam)`) to reflect component maintenance and keep things consistent. #### Merge Criteria