From 079d2666dd47cb6397374e965a506f3614e970bb Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 02:39:15 +0300
Subject: [PATCH 01/15] Testing, 1-2
---
README.md | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 3ec6fe06833..7e7a477834c 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,36 @@
-
+
+
+
+
-
+
-
+
-
+
-
+
-Requires the latest version of CBA A3 | BIF thread
+Requires the latest version of CBA A3 | BIF thread | Facebook | YouTube | Twitter
**ACE3** is a joint effort by the teams behind **ACE2**, **AGM** and **CSE** to improve the realism and authenticity of Arma 3.
-This mod is entirely **open-source**, and everyone is free to propose changes or maintain their own, customized version as long as they make their changes open to the public in accordance with the GNU General Public License (for more information check the license file attached to this project).
+The project is entirely **open-source**. Feel free to propose changes or maintain their own, customized version as long as they make their changes open to the public in accordance with the GNU General Public License (for more information check the license file attached to this project).
-The mod is **built modularly** — almost any PBO can be removed, thus a team can maintain its own tailored version of ACE, which excludes a select number of components that they don't like, or which conflict with other add-ons. Components themselves, like e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
+The mod is **built modularly**, so almost any PBO can be removed. This way, a team can maintain its own tailored version of ACE that might exclude any components they don't need, or those possibly conflicting with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
### Features
* Improved medical system
@@ -31,18 +40,20 @@ The mod is **built modularly** — almost any PBO can be removed, thus a team ca
* Realistic names for vehicles and weapons
* Realistic ballistics including wind and humidity
* Backblast simulation
-* A fire control system for armored vehicles and helicopters
+* A fire control system for armored vehicles and helicopters
***and more...***
#### Guides & How-Tos
-If you installed ACE3, but have trouble understanding how it all works, or where to start — see [Getting Started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md).
+If you installed ACE3 but have trouble understanding how it all works, or where to start, read this article:
+* [Getting Started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
#### Contributing
-If you want to help put with the ongoing development, you can do so by looking for possible bugs or by contributing new features. To contribute something to ACE, simply fork this repository and submit your pull requests for review by other collaborators. In the process, please add yourself to the author array of any .pbo you will be editing and the AUTHORS.txt file; including a valid email address.
+You can help out with the ongoing development by looking for potential bugs in the existing code, or by contributing new features. To contribute something to ACE, simply fork this repository and submit your pull requests for review by other collaborators. In the process, please 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 report a bug, propose a feature, or suggest a change to the existing one — please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues). See [this link](http://ace3mod.com/wiki/user/how-to-report-an-issue.html) for details.
+Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report a bug, propose a feature, or suggest a change to the existing set. See also:
+* [How to report an issue](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
+* [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
#### Testing & Building
-If you want to help us test the latest development changes, feel free to download our master branch, using either git — if familiar with the process — or directly, by following [this link](https://github.com/acemod/ACE3/archive/master.zip).
-
-To find out how to set up your development environment and build a version of ACE for testing, follow [these instructions](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md).
+If you want to help us test the latest development changes, first download our master branch directly ([link](https://github.com/acemod/ACE3/archive/master.zip)), or using [git commands](https://help.github.com/articles/fetching-a-remote/), then create a test build:
+* [Setting Up The Development Environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) — step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
From 2a99448fac5d8168f8d48d31157b5ce1e35798b3 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 03:53:43 +0300
Subject: [PATCH 02/15] 3-4...
---
README.md | 53 +++++++++++++++++++++++++++++------------------------
1 file changed, 29 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 7e7a477834c..f37927c77cd 100644
--- a/README.md
+++ b/README.md
@@ -8,52 +8,57 @@
alt="ACE3 Wiki" />
-
-
-
+
+
+
+
-Requires the latest version of CBA A3 | BIF thread | Facebook | YouTube | Twitter
+Requires the latest version of CBA A3. Visit us on Facebook | YouTube | Twitter
**ACE3** is a joint effort by the teams behind **ACE2**, **AGM** and **CSE** to improve the realism and authenticity of Arma 3.
-The project is entirely **open-source**. Feel free to propose changes or maintain their own, customized version as long as they make their changes open to the public in accordance with the GNU General Public License (for more information check the license file attached to this project).
+The project is entirely **open-source** and all contributions are welcome. Feel free to maintain your own custom version, so long as the changes you make are open to the public in accordance with the GNU General Public License:
+* [`LICENSE`](https://github.com/acemod/ACE3/blob/master/LICENSE)
-The mod is **built modularly**, so almost any PBO can be removed. This way, a team can maintain its own tailored version of ACE that might exclude any components they don't need, or those possibly conflicting with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
+The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those that might possibly conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
### Features
-* Improved medical system
-* Logistics system including cargo transport and vehicle maintenance
-* Explosives system including different trigger types
-* Captivity system
-* Realistic names for vehicles and weapons
-* Realistic ballistics including wind and humidity
-* Backblast simulation
-* A fire control system for armored vehicles and helicopters
- ***and more...***
-
-#### Guides & How-Tos
-If you installed ACE3 but have trouble understanding how it all works, or where to start, read this article:
-* [Getting Started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
+* Improved medical system
+* Logistics system including cargo transport and vehicle maintenance
+* Explosives system including different trigger types
+* Captivity system
+* Realistic names for vehicles and weapons
+* Realistic ballistics including wind and humidity
+* Backblast simulation
+* A fire control system for armored vehicles and helicopters
+ ***and more...***
+
+#### Guides & how-tos
+If you installed ACE3 but have trouble understanding how it all works, or where to start, read this:
+* [Getting started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
#### Contributing
-You can help out with the ongoing development by looking for potential bugs in the existing code, or by contributing new features. To contribute something to ACE, simply fork this repository and submit your pull requests for review by other collaborators. In the process, please 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.
+You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. To contribute something to ACE, 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.
-Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report a bug, propose a feature, or suggest a change to the existing set. See also:
+Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report a bug, propose a feature, or suggest changes to the existing ones. See also:
* [How to report an issue](http://ace3mod.com/wiki/user/how-to-report-an-issue.html)
* [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
-#### Testing & Building
-If you want to help us test the latest development changes, first download our master branch directly ([link](https://github.com/acemod/ACE3/archive/master.zip)), or using [git commands](https://help.github.com/articles/fetching-a-remote/), then create a test build:
-* [Setting Up The Development Environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) — step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
+#### Testing & building
+To help us test the latest development changes, first, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or with [git commands](https://help.github.com/articles/fetching-a-remote/)), then assemble a local test build:
+* [Setting up the development environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) — step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
From c2588583b138afff53a86c414529f1629b928ea8 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 04:08:58 +0300
Subject: [PATCH 03/15] And just one more
---
README.md | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
index f37927c77cd..9dadd570609 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,8 @@
+ height="96" />
-
-
-
@@ -46,11 +42,11 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
* Realistic ballistics including wind and humidity
* Backblast simulation
* A fire control system for armored vehicles and helicopters
- ***and more...***
+***and more...***
#### Guides & how-tos
-If you installed ACE3 but have trouble understanding how it all works, or where to start, read this:
-* [Getting started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
+If you installed ACE3 but have trouble understanding how it all works, or where to start, read this first:
+* [Getting started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
#### Contributing
You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. To contribute something to ACE, 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.
@@ -60,5 +56,5 @@ Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report
* [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
#### Testing & building
-To help us test the latest development changes, first, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or with [git commands](https://help.github.com/articles/fetching-a-remote/)), then assemble a local test build:
-* [Setting up the development environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) — step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
+To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or with [git commands](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build:
+* [Setting up the development environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) – step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
From 1dfd6651545e800799b39da6f2df070a1efe9d8a Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 04:24:25 +0300
Subject: [PATCH 04/15] Upscaling the logo +Reddit link
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 9dadd570609..82a7910fc69 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
+ height="112" />
@@ -24,7 +24,7 @@
alt="ACE3 License" />
-Requires the latest version of CBA A3. Visit us on Facebook | YouTube | Twitter
+Requires the latest version of CBA A3. Visit us on Facebook | YouTube | Twitter | Reddit
**ACE3** is a joint effort by the teams behind **ACE2**, **AGM** and **CSE** to improve the realism and authenticity of Arma 3.
From 90965449225968a1cb94dd32441a147b97dd2507 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 04:30:24 +0300
Subject: [PATCH 05/15] Backblast AREA
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 82a7910fc69..1be9e994c1d 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
The project is entirely **open-source** and all contributions are welcome. Feel free to maintain your own custom version, so long as the changes you make are open to the public in accordance with the GNU General Public License:
* [`LICENSE`](https://github.com/acemod/ACE3/blob/master/LICENSE)
-The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those that might possibly conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
+The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those possibly in conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
### Features
* Improved medical system
@@ -40,7 +40,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
* Captivity system
* Realistic names for vehicles and weapons
* Realistic ballistics including wind and humidity
-* Backblast simulation
+* Backblast area simulation
* A fire control system for armored vehicles and helicopters
***and more...***
From 00f2389fc00aaff1aa8ff6de3baac07ac82c9363 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 04:33:49 +0300
Subject: [PATCH 06/15] less is more
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1be9e994c1d..b0cfaf11d34 100644
--- a/README.md
+++ b/README.md
@@ -56,5 +56,5 @@ Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report
* [How to make a feature request](http://ace3mod.com/wiki/user/how-to-make-a-feature-request.html)
#### Testing & building
-To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or with [git commands](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build:
+To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or [with git](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build:
* [Setting up the development environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) – step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
From 27ad0c3a286cbfd1e66a5eb32febe137ae550d2c Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 05:26:13 +0300
Subject: [PATCH 07/15] HTML5 strict
---
README.md | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index b0cfaf11d34..1ef1c359e50 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,27 @@
+ height="112">
+ alt="ACE version">
+ alt="ACE download">
+ alt="ACE issues">
+ alt="BIF thread">
+ alt="ACE license">
Requires the latest version of CBA A3. Visit us on Facebook | YouTube | Twitter | Reddit
@@ -41,7 +41,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
* Realistic names for vehicles and weapons
* Realistic ballistics including wind and humidity
* Backblast area simulation
-* A fire control system for armored vehicles and helicopters
+* A fire control system for armored vehicles and helicopters
***and more...***
#### Guides & how-tos
From f6ecfefe539b0b73861b36aa50ac765997360f4e Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 06:41:48 +0300
Subject: [PATCH 08/15] Up-to-date feature list
---
README.md | 42 +++++++++++++++++++++++++++++++++---------
1 file changed, 33 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 1ef1c359e50..9fa736a49a7 100644
--- a/README.md
+++ b/README.md
@@ -33,18 +33,42 @@ The project is entirely **open-source** and all contributions are welcome. Feel
The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those possibly in conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
-### Features
-* Improved medical system
-* Logistics system including cargo transport and vehicle maintenance
-* Explosives system including different trigger types
+### Core features
+* Brand new 3D interaction/action system
+* Performance and reliability framework
+* Focus on modularity and customization
+* New flexible client and server settings & configuration
+* Improved medical system with various levels (Basic/Advanced) focus on gameplay/realism
+* Proper & consistent network-synced weather
+* Wind and weather-based ballistics
* Captivity system
+* Explosives system, including different trigger types
+* Map screen improvements – marker placement and map tools
+* Advanced missile guidance and laser designation
+
+#### Additional features
+* Carrying and dragging
* Realistic names for vehicles and weapons
-* Realistic ballistics including wind and humidity
-* Backblast area simulation
-* A fire control system for armored vehicles and helicopters
-***and more...***
+A fire control system (FCS) for armored vehicles and helicopters
+* Realistic ballistics/FCS calculated in C/C++ extensions
+* Backblast area and overpressure simulation
+* Disposable launchers
+* Realistic G-forces
+* Vehicle locking
+* Realistic night and thermal vision modes
+* Magazine repacking
+* Realistic weapon overheating mechanic
+* Combat deafness (temporary loss of hearing) simulation
+* Improved ragdoll physics
+* Improved interactions for AARs and ammo bearers
+* Adjustable sniper scopes
+* No idle animation with lowered weapon
+* No talking player avatar
+* Jumping over obstacles, climbing over walls and cutting down fences
+* Vector, MicroDAGR and Kestrel devices
+***and much more...***
-#### Guides & how-tos
+### Guides & how-tos
If you installed ACE3 but have trouble understanding how it all works, or where to start, read this first:
* [Getting started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
From 0167d98894fdcb02045f8babf68a203d75fe8098 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 06:52:40 +0300
Subject: [PATCH 09/15] missing bullet
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 9fa736a49a7..22e6e715921 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
* Performance and reliability framework
* Focus on modularity and customization
* New flexible client and server settings & configuration
-* Improved medical system with various levels (Basic/Advanced) focus on gameplay/realism
+* Improved medical system with various levels (basic/advanced) focus on gameplay/realism
* Proper & consistent network-synced weather
* Wind and weather-based ballistics
* Captivity system
@@ -49,7 +49,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
#### Additional features
* Carrying and dragging
* Realistic names for vehicles and weapons
-A fire control system (FCS) for armored vehicles and helicopters
+* A fire control system (FCS) for armored vehicles and helicopters
* Realistic ballistics/FCS calculated in C/C++ extensions
* Backblast area and overpressure simulation
* Disposable launchers
From 6b4da61fa4b5b7d43ad8be9dda8768db8e4fbf49 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 06:57:13 +0300
Subject: [PATCH 10/15] Embedded the license link
---
README.md | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 22e6e715921..29729c97ab0 100644
--- a/README.md
+++ b/README.md
@@ -28,8 +28,7 @@
**ACE3** is a joint effort by the teams behind **ACE2**, **AGM** and **CSE** to improve the realism and authenticity of Arma 3.
-The project is entirely **open-source** and all contributions are welcome. Feel free to maintain your own custom version, so long as the changes you make are open to the public in accordance with the GNU General Public License:
-* [`LICENSE`](https://github.com/acemod/ACE3/blob/master/LICENSE)
+The project is entirely **open-source** and all contributions are welcome. Feel free to maintain your own custom version, so long as the changes you make are open to the public in accordance with the GNU General Public License ([GPLv2](https://github.com/acemod/ACE3/blob/master/LICENSE)).
The mod is **built modularly**, so almost any included PBO can be easily removed from the configuration. This way, a team can maintain its own tailored version of ACE by simply excluding any components they don't need, or those possibly in conflict with other add-ons. Modules themselves, e.g. the medical system, also include various customization options, allowing mission designers to tweak the overall experience.
From b94b6fad536b6d5e307a98f1a02bed60b3f6e40c Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Fri, 17 Apr 2015 07:27:24 +0300
Subject: [PATCH 11/15] Wiki links to site not repo
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 29729c97ab0..4ed84011bf3 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ The mod is **built modularly**, so almost any included PBO can be easily removed
### Guides & how-tos
If you installed ACE3 but have trouble understanding how it all works, or where to start, read this first:
-* [Getting started](https://github.com/acemod/ACE3/blob/master/documentation/user/getting-started.md)
+* [Getting started](http://ace3mod.com/wiki/user/getting-started.html)
#### Contributing
You can help out with the ongoing development by looking for potential bugs in our code base, or by contributing new features. To contribute something to ACE, 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.
@@ -80,4 +80,4 @@ Please, use our [Issue Tracker](https://github.com/acemod/ACE3/issues) to report
#### Testing & building
To help us test the latest development changes, download our master branch ([directly](https://github.com/acemod/ACE3/archive/master.zip), or [with git](https://help.github.com/articles/fetching-a-remote/)), then assemble a test build:
-* [Setting up the development environment](https://github.com/acemod/ACE3/blob/master/documentation/development/setting-up-the-development-environment.md) – step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
+* [Setting up the development environment](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) – step-by-step instructions on how to properly setup and build a version of ACE for testing purposes.
From 0a9972d7e05054b1aacef09dd00f486f39dae361 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Sat, 18 Apr 2015 04:54:07 +0300
Subject: [PATCH 12/15] Wiki/Shortcuts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
1. Switched places of Shortcut and PBO table columns
2. Combined Shift, Win and Tab keys with their respective unicode symbols (⇧, ⊞, ↹)
3. Key combinations are bound by the plus sign (+)
4. Renamed entries:
* Command> Action
* Interaction Menu (Selft)> Self-interaction menu
* Safe Mode> Safety toggle
* Main Gun> Primary weapon
* Clear jam> Clear firearm malfunction
* Wipe Goggles> Wipe off goggles
* Tap Shoulder> Tap on the shoulder
* Ammo> Ammunition
5. Added common prefix to sets of keys for visual grouping (NVG, Scope, Vector, FCS)
6. Proper PBO names are tagged as code
---
documentation/user/shourtcuts.md | 390 +++++++++++++++----------------
1 file changed, 195 insertions(+), 195 deletions(-)
diff --git a/documentation/user/shourtcuts.md b/documentation/user/shourtcuts.md
index d44dc548868..0e6444c645d 100644
--- a/documentation/user/shourtcuts.md
+++ b/documentation/user/shourtcuts.md
@@ -7,198 +7,198 @@ parent: wiki
---
-
-
- PBO |
- Command |
- Shortcut |
-
-
-
-
- ACE_Interaction |
- Interaction Menu |
- Win_Left |
-
-
- ACE_Interaction |
- Interaction Menu (Self) |
- Ctrl Win_Left |
-
-
- ACE_Interaction |
- Open / Close Door |
- Ctrl Space |
-
-
- ACE_Interaction |
- Tap Shoulder |
- Ctrl T |
-
-
- ACE_Logistics |
- Modifier Key |
- Ctrl_Left |
-
-
- ACE_Goggles |
- Wipe Goggles |
- Ctrl Shift T |
-
-
- ACE_Grenades |
- Switch Grenade Mode |
- 8 |
-
-
- ACE_NameTags |
- Show Names |
- Ctrl_Left |
-
-
- ACE_NightVision |
- Increase NVG Brightness |
- Alt Page Up |
-
-
- ACE_NightVision |
- Decrease NVG Brightness |
- Alt Page Down |
-
-
- ACE_Overheating |
- Clear jam |
- Shift R |
-
-
- ACE_Parachute |
- Show Altimeter |
- O |
-
-
- ACE_Reload |
- Check Ammo |
- Ctrl R |
-
-
- ACE_SafeMode |
- Safe Mode |
- `(en) | ^(de) |
-
-
- ACE_Scopes |
- Adjust Elevation Up |
- Page Up |
-
-
- ACE_Scopes |
- Adjust Elevation Down |
- Page Down |
-
-
- ACE_Scopes |
- Adjust Windage Left |
- Ctrl Page Up |
-
-
- ACE_Scopes |
- Adjust Windage Right |
- Ctrl Page Down |
-
-
- ACE_Vector |
- Vector - Azimuth Key |
- Tab |
-
-
- ACE_Vector |
- Vector - Distance Key |
- R |
-
-
- ACE_Vehicles |
- Speed Limiter |
- Del |
-
-
- ACE_WeaponSelect |
- Select Pistol |
- 1 |
-
-
- ACE_WeaponSelect |
- Select Rifle |
- 2 |
-
-
- ACE_WeaponSelect |
- Select Grenade Launcher |
- 3 |
-
-
- ACE_WeaponSelect |
- Select Binoculars |
- 5 |
-
-
- ACE_WeaponSelect |
- Select Frag Grenade |
- 6 |
-
-
- ACE_WeaponSelect |
- Select Non-Frag Grenade |
- 7 |
-
-
- ACE_WeaponSelect |
- Holster Weapon |
- 0 |
-
-
- ACE_WeaponSelect |
- Engine on |
- 2 |
-
-
- ACE_WeaponSelect |
- Engine off |
- 1 |
-
-
- ACE_WeaponSelect |
- Select Main Gun |
- 3 |
-
-
- ACE_WeaponSelect |
- Select Machine Gun |
- 4 |
-
-
- ACE_WeaponSelect |
- Select Missiles |
- 5 |
-
-
- ACE_WeaponSelect |
- Fire Smoke Launcher |
- 9 |
-
-
- ACE_FireControlSsystem |
- Lase Target / Measure Distance |
- Tab |
-
-
- ACE_FireControlSsystem |
- Adjust FCS Range (Up) |
- Page Up |
-
-
- ACE_FireControlSsystem |
- Adjust FCS Range (Down) |
- Page Down |
-
-
-
\ No newline at end of file
+
+
+ Shortcut |
+ Action |
+ PBO |
+
+
+
+
+ ⊞ Win |
+ Interaction menu |
+ ACE_Interaction |
+
+
+ Ctrl+⊞ Win |
+ Self-interaction menu |
+ ACE_Interaction |
+
+
+ Ctrl+Space |
+ Open/close door |
+ ACE_Interaction |
+
+
+ Ctrl+T |
+ Tap on the shoulder |
+ ACE_Interaction |
+
+
+ Ctrl |
+ Modifier key |
+ ACE_Logistics |
+
+
+ Ctrl+⇧ Shift+T |
+ Wipe off goggles |
+ ACE_Goggles |
+
+
+ 8 |
+ Switch grenade mode |
+ ACE_Grenades |
+
+
+ Ctrl |
+ Show names |
+ ACE_NameTags |
+
+
+ Alt+Page Up |
+ NVG: Increase brightness |
+ ACE_NightVision |
+
+
+ Alt+Page Down |
+ NVG: Decrease brightness |
+ ACE_NightVision |
+
+
+ ⇧ Shift+R |
+ Clear firearm malfunction |
+ ACE_Overheating |
+
+
+ O |
+ Altimeter |
+ ACE_Parachute |
+
+
+ Ctrl+R |
+ Check ammunition |
+ ACE_Reload |
+
+
+ ` |
+ Safety toggle |
+ ACE_SafeMode |
+
+
+ Page Up |
+ Scope: Elevation up |
+ ACE_Scopes |
+
+
+ Page Down |
+ Scope: Elevation down |
+ ACE_Scopes |
+
+
+ Ctrl+Page Up |
+ Scope: Windage left |
+ ACE_Scopes |
+
+
+ Ctrl+Page Down |
+ Scope: Windage right |
+ ACE_Scopes |
+
+
+ Tab ↹ |
+ Vector: Azimuth key |
+ ACE_Vector |
+
+
+ R |
+ Vector: Distance key |
+ ACE_Vector |
+
+
+ Del |
+ Speed limiter |
+ ACE_Vehicles |
+
+
+ 1 |
+ Pistol |
+ ACE_WeaponSelect |
+
+
+ 2 |
+ Rifle |
+ ACE_WeaponSelect |
+
+
+ 3 |
+ Grenade launcher |
+ ACE_WeaponSelect |
+
+
+ 5 |
+ Binoculars |
+ ACE_WeaponSelect |
+
+
+ 6 |
+ Frag grenade |
+ ACE_WeaponSelect |
+
+
+ 7 |
+ Non-frag grenade |
+ ACE_WeaponSelect |
+
+
+ 0 |
+ Holster weapon |
+ ACE_WeaponSelect |
+
+
+ 2 |
+ Engine on |
+ ACE_WeaponSelect |
+
+
+ 1 |
+ Engine off |
+ ACE_WeaponSelect |
+
+
+ 3 |
+ Primary weapon |
+ ACE_WeaponSelect |
+
+
+ 4 |
+ Machine gun |
+ ACE_WeaponSelect |
+
+
+ 5 |
+ Missiles |
+ ACE_WeaponSelect |
+
+
+ 9 |
+ Fire smoke launcher |
+ ACE_WeaponSelect |
+
+
+ Tab ↹ |
+ FCS: Lase target (measure distance) |
+ ACE_FireControlSsystem |
+
+
+ Page Up |
+ FCS: Range up |
+ ACE_FireControlSsystem |
+
+
+ Page Down |
+ FCS: Range down |
+ ACE_FireControlSsystem |
+
+
+
From 6c3ca2c347cc537449f6ac607977bd41d6d31bb3 Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Sat, 18 Apr 2015 05:45:15 +0300
Subject: [PATCH 13/15] WIP note
---
documentation/user/getting-started.md | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/documentation/user/getting-started.md b/documentation/user/getting-started.md
index 5a9c3f69176..7f7d7ade2e1 100644
--- a/documentation/user/getting-started.md
+++ b/documentation/user/getting-started.md
@@ -1,20 +1,20 @@
---
layout: wiki
-title: Getting Started
+title: Getting started
group: user
order: 0
parent: wiki
---
+
+
Note:
+
This page is currently under construction. Please, come back later.
+
+
From cfb6d9eeea90797b1a8f8aa9259799f9b861339d Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Sat, 18 Apr 2015 07:21:16 +0300
Subject: [PATCH 14/15] Wiki/Feats
Minor rewrite to improve the flow by minimizing repetitive wording.
---
.../user/how-to-make-a-feature-request.md | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/documentation/user/how-to-make-a-feature-request.md b/documentation/user/how-to-make-a-feature-request.md
index bfc5401f38a..408a531fbbe 100644
--- a/documentation/user/how-to-make-a-feature-request.md
+++ b/documentation/user/how-to-make-a-feature-request.md
@@ -6,19 +6,17 @@ order: 11
parent: wiki
---
-### Before requesting
+### Background
+ACE2, AGM and CSE had a lot of features implemented or planned. All of them are or have been evaluated for inclusion in ACE3 itself, and we'd like to port the majority of them eventually. However, due to time constraints, we have managed to finish only a fraction of the job so far.
-ACE 2, AGM and CSE had a lot of features implemented or planned. All of them are or have been evaluated for inclusion in ACE3 itself, and we'd like to port the majority of them eventually. However, due to time constraints, we have only managed to do a fraction of the job so far.
-
-There's really no point on making feature requests for anything included or planned for inclusion in ACE2, AGM or CSE. The majority of those things are been considered for porting or rewritting already.
+Please refrain from making requests for any planned or existing features from either ACE2, AGM or CSE. Most of them are already being or have been considered for porting or a rewrite.
-
Please note:
-
Due to the pace at which development is taking place, we are establishing a feature request embargo during the first week weeks prior and posterior to the first release. Feel free to add feature requests as described below, but don't expect them to be evaluated or discussed yet. Any dev activity on the feature request thread is highly unlikely during that period.
+
Note:
+
Due to our current work load, in the period of weeks prior and posterior to the first release, new feature requests are under embargo. Feel free to submit yours now, but don't expect them to be considered just yet. Any treatment or attention by developers towards the feature request thread is highly unlikely during this time.
### Requesting a feature
+In order to avoid duplicates and keep the issue tracker organized, we have created a common Issue for feature request. Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier.
-In order not to spam the issue tracker with duplicated requests, we have have created a single Issue for feature request. Any and all requests should be done there, where they will get discussed and evaluated. Before posting a new one, please make sure to check the previous entries on the thread and make a quick search; please don't reiterate requests that had already been either accepted for inclusion or disregarded.
-
-Accepted feature requests may be moved to a separate issue by moderators for further discussion.
+Following their approval, feature requests may be moved by moderators to a separate issue for further discussion.
From a2eececf080c93393730127c1a3d238cf162521b Mon Sep 17 00:00:00 2001
From: Bracconiere
Date: Sat, 18 Apr 2015 07:29:21 +0300
Subject: [PATCH 15/15] Using actual title for the link to #414
---
documentation/user/how-to-make-a-feature-request.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/documentation/user/how-to-make-a-feature-request.md b/documentation/user/how-to-make-a-feature-request.md
index 408a531fbbe..7b0c52478db 100644
--- a/documentation/user/how-to-make-a-feature-request.md
+++ b/documentation/user/how-to-make-a-feature-request.md
@@ -17,6 +17,6 @@ Please refrain from making requests for any planned or existing features from ei
### Requesting a feature
-In order to avoid duplicates and keep the issue tracker organized, we have created a common Issue for feature request. Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier.
+In order to avoid duplicates and keep the issue tracker organized, we have created a common issue for ACE 3 Feature requests. Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier.
Following their approval, feature requests may be moved by moderators to a separate issue for further discussion.