Revert "Update from acemod master (#1)" (#2)

This reverts commit 4d1a519.
acemod · Jan 17, 2018 · 5ead6c0 · 5ead6c0
1 parent 4d1a519
commit 5ead6c0
Show file tree

Hide file tree

Showing 2,004 changed files with 15,591 additions and 39,228 deletions.
diff --git a/.gibot.yml b/.gibot.yml
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -3,10 +3,8 @@
 **ACE3 Version:** `3.x.x` (stable / dev + commit hash)
 
 **Mods:**
-```
-- CBA_A3
-- ace
-```
+- `@CBA_A3`
+- `@ace`
 
 **Description:**
 - Add a detailed description of the error. This makes it easier for us to fix the issue.

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,4 +2,4 @@
 - Describe what this pull request will do
 - Each change in a separate line
 - Include documentation if applicable
-- Respect the [Development Guidelines](https://ace3mod.com/wiki/development/)
+- Respect the [Development Guidelines](http://ace3mod.com/wiki/development/)
diff --git a/.github_changelog_generator b/.github_changelog_generator
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,3 @@ texHeaders.bin
 *.swo
 *.biprivatekey
 Thumbs.db
-CHANGELOG.md
diff --git a/.lgtm b/.lgtm
@@ -0,0 +1,3 @@
+approvals = 1
+pattern = "(?i)LGTM|(?i):\\+1:|(?i):shipit:"
+self_approval_off = true
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1,4 +1,4 @@
-# ACE3 CONTRIBUTOR LIST
+# ACE3 CONTRIBUTOR LIST
 # If you contributed, but are not listed here, contact me:
 # [email protected]
 #
@@ -29,7 +29,6 @@ Walter Pearce <[email protected]>
 # CONTRIBUTORS
 [BIG]Bull
 11RDP-LoupVert <[email protected]>
-654wak654 <[email protected]>
 ACCtomeek <[email protected]>
 adam3adam <[email protected]>
 Adanteh
@@ -38,7 +37,6 @@ Aggr094 <[email protected]>
 alef <[email protected]>
 Aleksey EpMAK Yermakov <[email protected]>
 Alganthe <[email protected]>
-Andrea "AtixNeon" Verano <[email protected]>
 Anthariel <[email protected]>
 Arkhir <[email protected] >
 Asgar Serran <[email protected]>
@@ -85,15 +83,13 @@ Harakhti <[email protected]>
 havena <[email protected]>
 Hawkins
 Head <[email protected]>
-Hybrid V
 Karneck <[email protected]>
 Kavinsky <[email protected]>
 Kllrt <[email protected]>
 legman <[email protected]>
 Legolasindar "Viper" <[email protected]>
 licht-im-Norden87 <[email protected]>
 looter <[email protected]>
-Luigi "Luigium" Myrini <[email protected]>
 Macusercom <[email protected]>
 MarcBook
 meat <[email protected]>
@@ -105,7 +101,6 @@ nomisum <[email protected]>
 OnkelDisMaster <[email protected]>
 oscarmolinadev
 PaxJaromeMalues <[email protected]>
-Phyma <[email protected]>
 pokertour
 Professor <[email protected]>
 rakowozz

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 <p align="center">
     <a href="https://github.com/acemod/ACE3/releases/latest">
-        <img src="https://img.shields.io/badge/Version-3.10.1-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.6.2-blue.svg?style=flat-square" alt="ACE3 Version">
     </a>
     <a href="https://github.com/acemod/ACE3/issues">
         <img src="https://img.shields.io/github/issues-raw/acemod/ACE3.svg?style=flat-square&label=Issues" alt="ACE3 Issues">

diff --git a/ace_advanced_ballistics.dll b/ace_advanced_ballistics.dll
diff --git a/ace_advanced_ballistics_x64.dll b/ace_advanced_ballistics_x64.dll
diff --git a/ace_break_line_x64.dll b/ace_break_line_x64.dll
diff --git a/ace_clipboard_x64.dll b/ace_clipboard_x64.dll
diff --git a/ace_fcs_x64.dll b/ace_fcs_x64.dll
diff --git a/ace_medical_x64.dll b/ace_medical_x64.dll
diff --git a/ace_parse_imagepath_x64.dll b/ace_parse_imagepath_x64.dll
diff --git a/addons/advanced_ballistics/ACE_Settings.hpp b/addons/advanced_ballistics/ACE_Settings.hpp
@@ -69,7 +69,7 @@ class ACE_Settings {
         displayName = CSTRING(simulationInterval_DisplayName);
         description = CSTRING(simulationInterval_Description);
         typeName = "SCALAR";
-        value = 0.05;
+        value = 0.0;
     };
     class GVAR(simulationRadius) {
         category = CSTRING(DisplayName);

diff --git a/addons/advanced_ballistics/CfgVehicles.hpp b/addons/advanced_ballistics/CfgVehicles.hpp
@@ -71,7 +71,7 @@ class CfgVehicles {
                 displayName = CSTRING(simulationInterval_DisplayName);
                 description = CSTRING(simulationInterval_Description);
                 typeName = "NUMBER";
-                defaultValue = 0.05;
+                defaultValue = 0.0;
             };
             class simulationRadius {
                 displayName = CSTRING(simulationRadius_DisplayName);

diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -39,7 +39,7 @@ if (!hasInterface) exitWith {};
     {
         _x params ["_modPBO", "_compatPBO"];
         if ((isClass (configFile >> "CfgPatches" >> _modPBO)) && {!isClass (configFile >> "CfgPatches" >> _compatPBO)}) then {
-            WARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
+            ACE_LOGWARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
         };
     } forEach [
         ["RH_acc","ace_compat_rh_acc"],

diff --git a/addons/advanced_ballistics/XEH_preInit.sqf b/addons/advanced_ballistics/XEH_preInit.sqf
@@ -2,8 +2,6 @@
 
 ADDON = false;
 
-PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
-PREP_RECOMPILE_END;
 
 ADDON = true;
diff --git a/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf b/addons/advanced_ballistics/functions/fnc_calculateAmmoTemperatureVelocityShift.sqf
@@ -10,9 +10,6 @@
  * Return Value:
  * muzzle velocity shift - m/s <NUMBER>
  *
- * Example:
- * [[], 5] call ace_advanced_ballistics_fnc_calcilateAmmoTemperatureVelocityShift
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf b/addons/advanced_ballistics/functions/fnc_calculateAtmosphericCorrection.sqf
@@ -13,9 +13,6 @@
  * Return Value:
  * corrected ballistic coefficient <NUMBER>
  *
- * Example:
- * [2, 5, 5, 0.5, "ASM"] call ace_advanced_ballistics_fnc_calculateAtmosphericCorrection
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf b/addons/advanced_ballistics/functions/fnc_calculateBarrelLengthVelocityShift.sqf
@@ -4,17 +4,14 @@
  * Calculates the muzzle velocity shift caused by different barrel lengths
  *
  * Arguments:
- * 0: barrel length - mm <NUMBER>
+ * 0: barrel length - mm
  * 1: muzzle velocity lookup table - m/s <ARRAY>
  * 2: barrel length lookup table - mm <ARRAY>
  * 3: muzzle velocity - m/s <NUMBER>
  *
  * Return Value:
  * muzzle velocity shift - m/s <NUMBER>
  *
- * Example:
- * [5, [0,5], [0,5], 5] call ace_advanced_ballistics_fnc_calculateBarrelLengthVelocityShift
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_calculateRetardation.sqf b/addons/advanced_ballistics/functions/fnc_calculateRetardation.sqf
@@ -11,9 +11,6 @@
  * Return Value:
  * retardation - m/(s^2) <NUMBER>
  *
- * Example:
- * [5, 20, 10] call ace_advanced_ballistics_fnc_calculateRetardation
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf b/addons/advanced_ballistics/functions/fnc_calculateStabilityFactor.sqf
@@ -15,9 +15,6 @@
  * Return Value:
  * stability factor <NUMBER>
  *
- * Example:
- * [1, 2, 3, 4, 5, 6, 7] call ace_advanced_ballistics_fnc_calculateStabilityFactor
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf b/addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
@@ -10,9 +10,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [] call ace_advanced_ballistics_fnc_diagnoseWeapons
- *
  * Public: No
  */
 #define DEBUG_MODE_FULL

diff --git a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@@ -9,9 +9,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [] call ace_advanced_ballistics_fnc_displayProtractor
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -8,9 +8,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [] call ace_advanced_ballistics_fnc_handleFirePFH
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -9,9 +9,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [] call ace_advanced_ballistics_fnc_handleFired
- *
  * Public: No
  */
 #include "script_component.hpp"
@@ -45,6 +42,12 @@ if (!GVAR(simulateForEveryone) && !(local _unit)) then {
 //if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // We currently do not have firedEHs on vehicles
 if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "CfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; };
 
+if (_abort || !(GVAR(extensionAvailable))) exitWith {
+    if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
+        EGVAR(windDeflection,trackedBullets) pushBack [_projectile, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
+    };
+};
+
 // Get Weapon and Ammo Configurations
 _AmmoCacheEntry = uiNamespace getVariable format[QGVAR(%1), _ammo];
 if (isNil "_AmmoCacheEntry") then {
@@ -83,12 +86,6 @@ if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
     };
 };
 
-if (_abort || !(GVAR(extensionAvailable))) exitWith {
-    if (missionNamespace getVariable [QEGVAR(windDeflection,enabled), false]) then {
-        EGVAR(windDeflection,trackedBullets) pushBack [_projectile, getNumber(configFile >> "CfgAmmo" >> _ammo >> "airFriction")];
-    };
-};
-
 _bulletTraceVisible = false;
 if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {
     if (currentWeapon ACE_player == binocular ACE_player) then {

diff --git a/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf b/addons/advanced_ballistics/functions/fnc_initModuleSettings.sqf
@@ -10,9 +10,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [LOGIC, [bob, kevin], true] call ace_advanced_ballistics_fnc_initModuleSettings
- *
  * Public: No
  */
 #include "script_component.hpp"

diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@@ -8,9 +8,6 @@
  * Return Value:
  * None
  *
- * Example:
- * [] call ace_advanced_ballistics_fnc_initializeTerrainExtension
- *
  * Public: No
  */
 #include "script_component.hpp"
@@ -25,7 +22,6 @@ _initStartTime = CBA_missionTime;
 _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
 
 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
-    INFO_1("Terrain already initialized [world: %1]", worldName);
     #ifdef DEBUG_MODE_FULL
         systemChat "AdvancedBallistics: Terrain already initialized";
     #endif
@@ -36,14 +32,11 @@ _gridCells = _mapGrids * _mapGrids;
 
 GVAR(currentGrid) = 0;
 
-INFO_2("Starting Terrain Extension [cells: %1] [world: %2]", _gridCells, worldName);
-
 [{
     params ["_args","_idPFH"];
     _args params ["_mapGrids", "_gridCells", "_initStartTime"];
 
     if (GVAR(currentGrid) >= _gridCells) exitWith {
-        INFO_2("Finished terrain initialization in %1 seconds [world: %2]", ceil(CBA_missionTime - _initStartTime), worldName);
         #ifdef DEBUG_MODE_FULL
             systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(CBA_missionTime - _initStartTime)];
         #endif