Merge pull request #1 from acemod/master

Update from master

.gitignore

@@ -5,3 +5,4 @@ texHeaders.bin
 *.swp
 *.swo
 *.biprivatekey
+Thumbs.db

.travis.yml

@@ -0,0 +1,14 @@
+branches:
+  only:
+    - master
+language: python
+python:
+  - "3.4"
+before_script:
+  - pip install pygithub
+  - pip install pygithub3
+script:
+  - python3 tools/deploy.py
+env:
+  global:
+    - secure: "KcJQbknBOdC5lA4nFGKPXVRVIGLDXDRzC8XkHuXJCE9pIR/wbxbkvx8fHKcC6SC9eHgzneC3+o4m4+CjIbVvIwDgslRbJ8Y59i90ncONmdoRx1HUYHwuYWVZm9HJFjCsIbrEqhSyyKS+PB3WZVOLbErtNHsgS8f43PTh5Ujg7Vg="

AUTHORS.txt

@@ -18,26 +18,37 @@ Kieran
 NouberNou
 PabstMirror <pabstmirror@gmail.com>
 Ruthberg <ulteq@web.de>
+SilentSpike <SilentSpike100@gmail.com>
 tpM
 ViperMaul
 VKing <kauestad@gmail.com>
 Walter Pearce <jaynus@gmail.com>
 
 # CONTRIBUTORS
-11RDP-LoupVert <loupvert@11rdp.fr>
 [BIG]Bull
+11RDP-LoupVert <loupvert@11rdp.fr>
 ACCtomeek <tomeek99@gmail.com>
+adam3adam <br.ada@seznam.cz>
 Adanteh
 aeroson
 Aggr094 <bastards4glory@gmail.com>
+alef <alefor@gmail.com>
+Aleksey EpMAK Yermakov <epmak777@gmail.com>
 Alganthe <alganthe@live.fr>
 Anthariel <Contact@storm-simulation.com>
+Asgar Serran <piechottaf@web.de>
+Bla1337
+BlackPixxel
 BlackQwar
 Brakoviejo
 Brisse <brisse@outlook.com>
+BullHorn <bullhorn7@gmail.com>
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
+Coren <coren4@gmail.com>
 Crusty
+Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
+Dimaslg <dimaslg@telecable.es>
 eRazeri
 evromalarkey <evromalarkey@gmail.com>
 Falke75
@@ -47,49 +58,46 @@ Filip Basara <filip.basara93@googlemail.com>
 FreeZbe <freeseb@gmail.com>
 geraldbolso1899
 Ghost
+Gianmarco Varriale (TeamNuke) <admin@forhost.org>
 GieNkoV <gienkov.grzegorz@gmail.com>
 gpgpgpgp
 Grzegorz
-Gianmarco Varriale (TeamNuke) <admin@forhost.org>
 Hamburger SV
 Harakhti <shadowdragonphd@gmail.com>
 havena <silveredenis@gmail.com>
 Hawkins
-jokoho48
+jokoho482 <jokoho482@gmail.com>`
 Jonpas <jonpas33@gmail.com>
+Kavinsky <nmunozfernandez@gmail.com>
 Kllrt <kllrtik@gmail.com>
+legman <juicemelon@msn.com>
 Legolasindar "Viper" <legolasindar@gmail.com>
 licht-im-Norden87 <lichtimnorden87@gmail.com>
+Macusercom <macusercom@gmail.com>
 MarcBook
 meat <p.humberdroz@gmail.com>
 Michail Nikolaev
 nic547 <nic547@outlook.com>
+nikolauska <nikolauska1@gmail.com>
 nomisum <nomisum@gmail.com>
+OnkelDisMaster <onkeldismaster@gmail.com>
 oscarmolinadev
 pokertour
+Professor <lukas.trneny@wo.cz>
 rakowozz
+ramius86 <pasini86@hotmail.com>
 Raspu86
 Riccardo Petricca <petriccarcc@gmail.com>
 Robert Boklahánics <bokirobi@gmail.com>
-ramius86 <pasini86@hotmail.com>
+ruPaladin <happyworm24@rambler.ru>
 simon84 <badguy360th@gmail.com>
 Sniperwolf572 <tenga6@gmail.com>
+SzwedzikPL <szwedzikpl@gmail.com>
 Tachi <zaveruha007@gmail.com>
 Toaster <jonathan.pereira@gmail.com>
 Tonic
 Tourorist <tourorist@gmail.com>
 Valentin Torikian <valentin.torikian@gmail.com>
-zGuba
-Aleksey EpMAK Yermakov <epmak777@gmail.com>
-ruPaladin <happyworm24@rambler.ru>
-BlackPixxel
-Asgar Serran <piechottaf@web.de>
-Kavinsky <nmunozfernandez@gmail.com>
-Coren <coren4@gmail.com>
-OnkelDisMaster <onkeldismaster@gmail.com>
-Dimaslg <dimaslg@telecable.e>
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
-Bla1337
-nikolauska <nikolauska1@gmail.com>
-adam3adam <br.ada@seznam.cz>
-Professor <lukas.trneny@wo.cz> 
+Winter <simon@agius-muscat.net>
+zGuba

README.md

@@ -4,23 +4,23 @@
 </p>
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases">
-        <img src="http://img.shields.io/badge/Version-3.0.0-blue.svg?style=flat"
+        <img src="https://img.shields.io/badge/Version-3.1.1-blue.svg"
              alt="ACE version">
     </a>
-    <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"
+    <a href="https://github.com/acemod/ACE3/releases/download/v3.1.1/ace3_3.1.1.zip">
+        <img src="http://img.shields.io/badge/Download-51.7_MB-green.svg"
              alt="ACE download">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
-        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat&label=Issues"
+        <img src="http://img.shields.io/github/issues-raw/acemod/ACE3.svg?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"
+    <a href="http://forums.bistudio.com/showthread.php?191716-ACE3-A-collaborative-merger-between-AGM-CSE-and-ACE&p=2935435&viewfull=1#post2935435">
+        <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg"
              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"
+        <img src="http://img.shields.io/badge/License-GPLv2-red.svg"
              alt="ACE license">
     </a>
 </p>

addons/advanced_ballistics/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\advanced_ballistics

addons/advanced_ballistics/ACE_Settings.hpp

@@ -5,23 +5,29 @@ class ACE_Settings {
         typeName = "BOOL";
         value = 0;
     };
-    class GVAR(alwaysSimulateForSnipers) {
-        displayName = "Always Enabled For Snipers";
-        description = "Always enables advanced ballistics when high power optics are used";
+    class GVAR(simulateForSnipers) {
+        displayName = "Enabled For Snipers";
+        description = "Enables advanced ballistics for non local snipers (when using high power optics)";
         typeName = "BOOL";
         value = 1;
     };
-    class GVAR(disabledInFullAutoMode) {
-        displayName = "Disabled In FullAuto Mode";
-        description = "Disables the advanced ballistics during full auto fire";
+    class GVAR(simulateForGroupMembers) {
+        displayName = "Enabled For Group Members";
+        description = "Enables advanced ballistics for non local group members";
         typeName = "BOOL";
         value = 0;
     };
-    class GVAR(onlyActiveForLocalPlayers) {
-        displayName = "Disabled For Non Local Players";
-        description = "Disables the advanced ballistics for bullets coming from other players (enable this if you encounter frame drops during heavy firefights in multiplayer)";
+    class GVAR(simulateForEveryone) {
+        displayName = "Enabled For Everyone";
+        description = "Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)";
         typeName = "BOOL";
-        value = 1;
+        value = 0;
+    };
+    class GVAR(disabledInFullAutoMode) {
+        displayName = "Disabled In FullAuto Mode";
+        description = "Disables advanced ballistics during full auto fire";
+        typeName = "BOOL";
+        value = 0;
     };
     /* // TODO: We currently do not have firedEHs on vehicles
     class GVAR(vehicleGunnerEnabled) {

addons/advanced_ballistics/CfgVehicles.hpp

@@ -2,7 +2,7 @@ class CfgVehicles {
     class ACE_Module;
     class GVAR(ModuleSettings): ACE_Module {
         scope = 2;
-        displayName = "Advanced Ballistics";
+        displayName = CSTRING(DisplayName);
         icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
         category = "ACE";
         function = QUOTE(DFUNC(initModuleSettings));
@@ -12,28 +12,34 @@ class CfgVehicles {
         author = "Ruthberg";
         class Arguments {
             class enabled {
-                displayName = "Advanced Ballistics";
-                description = "Enables advanced ballistics";
+                displayName = CSTRING(enabled_DisplayName);
+                description = CSTRING(enabled_Description);
                 typeName = "BOOL";
                 defaultValue = 0;
             };
-            class alwaysSimulateForSnipers {
-                displayName = "Always Enabled For Snipers";
-                description = "Always enables advanced ballistics when high power optics are used";
+            class simulateForSnipers {
+                displayName = CSTRING(simulateForSnipers_DisplayName);
+                description = CSTRING(simulateForSnipers_Description);
                 typeName = "BOOL";
                 defaultValue = 1;
             };
-            class disabledInFullAutoMode {
-                displayName = "Disabled In FullAuto Mode";
-                description = "Disables the advanced ballistics during full auto fire";
+            class simulateForGroupMembers {
+                displayName = CSTRING(simulateForGroupMembers_DisplayName);
+                description = CSTRING(simulateForGroupMembers_Description);
                 typeName = "BOOL";
                 defaultValue = 0;
             };
-            class onlyActiveForLocalPlayers {
-                displayName = "Disabled For Non Local Players";
-                description = "Disables the advanced ballistics for bullets coming from other players (enable this if you encounter frame drops during heavy firefights in multiplayer)";
+            class simulateForEveryone {
+                displayName = CSTRING(simulateForEveryone_DisplayName);
+                description = CSTRING(simulateForEveryone_Description);
                 typeName = "BOOL";
-                defaultValue = 1;
+                defaultValue = 0;
+            };
+            class disabledInFullAutoMode {
+                displayName = CSTRING(disabledInFullAutoMod_DisplayName);
+                description = CSTRING(disabledInFullAutoMod_Description);
+                typeName = "BOOL";
+                defaultValue = 0;
             };
             /* // TODO: We currently do not have firedEHs on vehicles
             class vehicleGunnerEnabled {
@@ -44,35 +50,38 @@ class CfgVehicles {
             };
             */
             class ammoTemperatureEnabled {
-                displayName = "Enable Ammo Temperature Simulation";
-                description = "Muzzle velocity varies with ammo temperature";
+                displayName = CSTRING(ammoTemperatureEnabled_DisplayName);
+                description = CSTRING(ammoTemperatureEnabled_Description);
                 typeName = "BOOL";
                 defaultValue = 1;
             };
             class barrelLengthInfluenceEnabled {
-                displayName = "Enable Barrel Length Simulation";
-                description = "Muzzle velocity varies with barrel length";
+                displayName = CSTRING(barrelLengthInfluenceEnabled_DisplayName);
+                description = CSTRING(barrelLengthInfluenceEnabled_Description);
                 typeName = "BOOL";
                 defaultValue = 1;
             };
             class bulletTraceEnabled {
-                displayName = "Enable Bullet Trace Effect";
-                description = "Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)";
+                displayName = CSTRING(bulletTraceEnabled_DisplayName);
+                description = CSTRING(bulletTraceEnabled_Description);
                 typeName = "BOOL";
                 defaultValue = 1;
             };
             class simulationInterval {
-                displayName = "Simulation Interval";
-                description = "Defines the interval between every calculation step";
+                displayName = CSTRING(simulationInterval_DisplayName);
+                description = CSTRING(simulationInterval_Description);
                 typeName = "NUMBER";
                 defaultValue = 0.0;
             };
             class simulationRadius {
-                displayName = "Simulation Radius";
-                description = "Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles";
+                displayName = CSTRING(simulationRadius_DisplayName);
+                description = CSTRING(simulationRadius_Description);
                 typeName = "NUMBER";
                 defaultValue = 3000;
             };
         };
+        class ModuleDescription {
+            description = CSTRING(Description);
+        };
     };
-};
+};

addons/advanced_ballistics/RscTitles.hpp

@@ -1,17 +1,13 @@
-class RscTitles
-{
-    class RscTurretDial
-    {
+class RscTitles {
+    class RscTurretDial {
         idd=-1;
         onLoad="with uiNameSpace do { RscTurretDial = _this select 0 };";
         movingEnable=0;
         duration=5;
         fadeIn="false";
         fadeOut="false";
-        class controls
-        {
-            class RscTurretDial
-            {
+        class controls {
+            class RscTurretDial {
                 idc=132949;
                 type=0;
                 style=128;
@@ -28,18 +24,15 @@ class RscTitles
         };
     };
 
-    class RscProtractor
-    {
+    class RscProtractor {
         idd=-1;
         onLoad="with uiNameSpace do { RscProtractor = _this select 0 };";
         movingEnable=0;
         duration=60;
         fadeIn="false";
         fadeOut="false";
-        class controls
-        {
-            class RscProtractorBase
-            {
+        class controls {
+            class RscProtractorBase {
                 idc=132950;
                 type=0;
                 style=48;
@@ -54,8 +47,7 @@ class RscTitles
                 sizeEx=0.027;
                 text="";
             };
-            class RscProtractorMarker : RscProtractorBase
-            {
+            class RscProtractorMarker : RscProtractorBase {
                 idc=132951;
             };
         };

addons/advanced_ballistics/XEH_postInit.sqf

@@ -4,24 +4,11 @@
 
 GVAR(currentbulletID) = -1;
 
-GVAR(bulletDatabase) = [];
-GVAR(bulletDatabaseStartTime) = [];
-GVAR(bulletDatabaseSpeed) = [];
-GVAR(bulletDatabaseFrames) = [];
-GVAR(bulletDatabaseLastFrame) = [];
-GVAR(bulletDatabaseHDeflect) = [];
-GVAR(bulletDatabaseSpinDrift) = [];
-GVAR(bulletDatabaseOccupiedIndices) = [];
-GVAR(bulletDatabaseFreeIndices) = [];
-
-GVAR(WindInfo) = false;
-GVAR(WindInfoStart) = time;
-
 GVAR(Protractor) = false;
-GVAR(ProtractorStart) = time;
+GVAR(ProtractorStart) = ACE_time;
 
 GVAR(currentGrid) = 0;
-GVAR(INIT_MESSAGE_ENABLED) = false;
+GVAR(initMessageEnabled) = false;
 
 GVAR(extensionAvailable) = true;
 /* @TODO: Remove this until versioning is in sync with cmake/build versioning

addons/advanced_ballistics/XEH_preInit.sqf

@@ -6,12 +6,12 @@ PREP(calculateAmmoTemperatureVelocityShift);
 PREP(calculateAtmosphericCorrection);
 PREP(calculateBarrelLengthVelocityShift);
 PREP(calculateRetardation);
-PREP(calculateRoughnessLength);
 PREP(calculateStabilityFactor);
-PREP(calculateWindSpeed);
 PREP(displayProtractor);
 PREP(handleFired);
 PREP(initializeTerrainExtension);
 PREP(initModuleSettings);
+PREP(readAmmoDataFromConfig);
+PREP(readWeaponDataFromConfig);
 
 ADDON = true;