Merge pull request #6 from acemod/master

update my master fork

.gitignore

@@ -4,3 +4,4 @@ release/*
 texHeaders.bin
 *.swp
 *.swo
+*.biprivatekey

AUTHORS.txt

@@ -17,7 +17,7 @@ Janus
 Kieran
 NouberNou
 PabstMirror <pabstmirror@gmail.com>
-Ruthberg
+Ruthberg <ulteq@web.de>
 tpM
 ViperMaul
 VKing <kauestad@gmail.com>
@@ -33,6 +33,7 @@ Aggr094 <bastards4glory@gmail.com>
 Anthariel <Contact@storm-simulation.com>
 BlackQwar
 Brakoviejo
+Brisse <brisse@outlook.com>
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
 Crusty
@@ -69,7 +70,7 @@ Raspu86
 Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
 ramius86 <pasini86@hotmail.com>
-simon84
+simon84 <badguy360th@gmail.com>
 Sniperwolf572 <tenga6@gmail.com>
 Tachi <zaveruha007@gmail.com>
 Tonic
@@ -83,3 +84,4 @@ Asgar Serran <piechottaf@web.de>
 Kavinsky <nmunozfernandez@gmail.com>
 Coren <coren4@gmail.com>
 OnkelDisMaster <onkeldismaster@gmail.com>
+Dimaslg <dimaslg@telecable.e>

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C)  2014  Felix "KoffeinFlummi" Wiegand
+Copyright (C)  2015  Felix "KoffeinFlummi" Wiegand
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

README.md

@@ -1,48 +1,83 @@
 <p align="center">
-    <img src="https://github.com/acemod/ACE3/blob/master/extras/assets/logo/black/ACE3-Logo.jpg" height="80" />
+    <img src="https://github.com/acemod/ACE3/blob/master/extras/assets/logo/black/ACE3-Logo.jpg"
+         height="112">
 </p>
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="http://img.shields.io/badge/release-3.0-green.svg?style=flat" alt="ACE version">
+        <img src="http://img.shields.io/badge/Version-3.0.0-blue.svg?style=flat"
+             alt="ACE version">
     </a>
-    <a href="#">
-        <img src="http://img.shields.io/badge/download-22_MB-blue.svg?style=flat" alt="ACE download">
+    <a href="https://github.com/acemod/ACE3/archive/master.zip">
+        <img src="http://img.shields.io/badge/Download-48.3_MB-green.svg?style=flat"
+             alt="ACE download">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
-        <img src="http://img.shields.io/github/issues/acemod/ACE3.svg?style=flat" alt="ACE issues">
+        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat&label=Issues"
+             alt="ACE issues">
+    </a>
+    <a href="http://forums.bistudio.com/showthread.php?190433-ACE3-A-collaborative-merger-between-AGM-CSE-and-ACE&p=2910796&viewfull=1#post2910796">
+        <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat"
+             alt="BIF thread">
     </a>
     <a href="https://github.com/acemod/ACE3/blob/master/LICENSE">
-        <img src="http://img.shields.io/badge/license-GPLv2-red.svg?style=flat" alt="ACE license">
+        <img src="http://img.shields.io/badge/License-GPLv2-red.svg?style=flat"
+             alt="ACE license">
     </a>
 </p>
-<p align="center"><sup><strong>Requires the latest version of <a href="http://www.armaholic.com/page.php?id=18767">CBA A3</a> | <a href="#">BIF thread</a></strong></sup></p>
+<p align="center"><sup><strong>Requires the latest version of <a href="http://www.armaholic.com/page.php?id=18767">CBA A3</a>. Visit us on <a href="https://www.facebook.com/ACE3Mod">Facebook</a> | <a href="https://www.youtube.com/c/ACE3Mod">YouTube</a> | <a href="https://twitter.com/ACE3Mod">Twitter</a> | <a href="http://www.reddit.com/r/arma/search?q=ACE&restrict_sr=on&sort=new&t=all">Reddit</a></strong></sup></p>
 
 **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** 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** — 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 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
-*   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...***
+### 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
 
-#### 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).
+#### Additional features
+* Carrying and dragging
+* Realistic names for vehicles and weapons
+* 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<br>
+***and much more...***
 
-#### 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.
+### Guides & how-tos
+If you installed ACE3 but have trouble understanding how it all works, or where to start, read this first:
+* [Getting started](http://ace3mod.com/wiki/user/getting-started.html)
 
-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.
+#### 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.
 
-#### 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).
+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)
 
-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).
+#### 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](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.

addons/advanced_ballistics/ACE_Settings.hpp

@@ -57,7 +57,7 @@ class ACE_Settings {
     };
     class GVAR(simulationRadius) {
         displayName = "Simulation Radius";
-        description = "Defines the radius (in meters) in which advanced ballistics are applied";
+        description = "Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles";
         typeName = "SCALAR";
         value = 3000;
     };

addons/advanced_ballistics/CfgVehicles.hpp

@@ -69,7 +69,7 @@ class CfgVehicles {
             };
             class simulationRadius {
                 displayName = "Simulation Radius";
-                description = "Defines the radius (in meters) in which advanced ballistics are applied";
+                description = "Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles";
                 typeName = "NUMBER";
                 defaultValue = 3000;
             };

addons/advanced_ballistics/XEH_postInit.sqf

@@ -20,19 +20,11 @@ GVAR(WindInfoStart) = time;
 GVAR(Protractor) = false;
 GVAR(ProtractorStart) = time;
 
-// Those are only used in the pure sqf version (extension free PFH)
-GVAR(SimulationPrecision) = 2;
-GVAR(WindEnabled) = true;
-GVAR(SpinDriftEnabled) = true;
-GVAR(CoriolisEnabled) = true;
-GVAR(EoetvoesEnabled) = true;
-GVAR(AdvancedAirDragEnabled) = true;
-GVAR(TransonicRegionEnabled) = true;
-GVAR(AtmosphericDensitySimulationEnabled) = true;
-
 GVAR(currentGrid) = 0;
 GVAR(INIT_MESSAGE_ENABLED) = false;
 
+GVAR(extensionAvailable) = true;
+/* @TODO: Remove this until verisoning is in sync with cmake/build versioning
 GVAR(extensionVersion) = ("ace_advanced_ballistics" callExtension "version");
 GVAR(extensionAvailable) = (GVAR(extensionVersion) == EXTENSION_REQUIRED_VERSION);
 if (!GVAR(extensionAvailable)) exitWith {
@@ -42,5 +34,5 @@ if (!GVAR(extensionAvailable)) exitWith {
         diag_log text "[ACE] ERROR: ace_advanced_ballistics.dll is incompatible";
     };
 };
-
+*/
 [] call FUNC(initializeTerrainExtension);