Merge branch 'master' into fix-c4996

Conflicts: extensions/parse_imagepath/ace_parse_imagepath.cpp
acemod · Jun 12, 2016 · 8dc8926 · 8dc8926
2 parents 2f6b932 + 1c06764
commit 8dc8926
Show file tree

Hide file tree

Showing 1,019 changed files with 9,163 additions and 7,243 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,4 +10,3 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
-
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 release/*
+tools/temp
 *.cache
 *.pbo
 texHeaders.bin

diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -113,6 +113,7 @@ Sniperwolf572 <tenga6@gmail.com>
 System98
 SzwedzikPL <szwedzikpl@gmail.com>
 Tachi <zaveruha007@gmail.com>
+Tessa Elieff <Fastroping Sound - CreativeCommons Attributions 3.0>
 Toaster <jonathan.pereira@gmail.com>
 Tonic
 Tourorist <tourorist@gmail.com>

diff --git a/LICENSE b/LICENSE
@@ -26,6 +26,8 @@ Some folders of this project may contain a separate LICENSE file. Should
 that be the case, everything in that folder and all subfolders is subject
 to that license instead.
 
+ - ARMA PUBLIC LICENSE (\addons\apl)
+ - CreativeCommons Attributions 3.0 (\addons\fastroping\data\sounds)
 
 ============================================================================
                    Full GNU General Public License Text

diff --git a/README.md b/README.md
@@ -3,12 +3,15 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/acemod/ACE3/releases">
+    <a href="https://github.com/acemod/ACE3/releases/latest">
         <img src="https://img.shields.io/badge/Version-3.5.1-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">
     </a>
+    <a href="https://github.com/acemod/ACE3/releases">
+        <img src="https://img.shields.io/github/downloads/acemod/ACE3/total.svg?style=flat-square&label=Downloads" alt="ACE3 Downloads">
+    </a>
     <a href="https://forums.bistudio.com/topic/181341-ace3-a-collaborative-merger-between-agm-cse-and-ace/?p=2859670">
         <img src="https://img.shields.io/badge/BIF-Thread-lightgrey.svg?style=flat-square" alt="BIF Thread">
     </a>

diff --git a/addons/advanced_ballistics/CfgVehicles.hpp b/addons/advanced_ballistics/CfgVehicles.hpp
@@ -3,7 +3,7 @@ class CfgVehicles {
     class GVAR(ModuleSettings): ACE_Module {
         scope = 2;
         displayName = CSTRING(DisplayName);
-        icon = QUOTE(PATHTOF(UI\Icon_Module_Wind_ca.paa));
+        icon = QPATHTOF(UI\Icon_Module_Wind_ca.paa);
         category = "ACE";
         function = QUOTE(DFUNC(initModuleSettings));
         functionPriority = 1;

diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -5,7 +5,7 @@
 GVAR(currentbulletID) = -1;
 
 GVAR(Protractor) = false;
-GVAR(ProtractorStart) = ACE_time;
+GVAR(ProtractorStart) = CBA_missionTime;
 GVAR(allBullets) = [];
 GVAR(currentGrid) = 0;
 
@@ -24,16 +24,16 @@ if (!GVAR(extensionAvailable)) exitWith {
 
 if (!hasInterface) exitWith {};
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     //If not enabled, dont't add PFEH
     if (!GVAR(enabled)) exitWith {};
 
     //Run the terrain processor
     [] call FUNC(initializeTerrainExtension);
 
     // Register fire event handler
-    ["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
-    ["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
+    ["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayerNonLocal", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
 
     //Add warnings for missing compat PBOs (only if AB is on)
     {
@@ -50,7 +50,7 @@ if (!hasInterface) exitWith {};
         ["iansky_opt","ace_compat_sma3_iansky"],
         ["R3F_Armes","ace_compat_r3f"]
     ];
-}] call EFUNC(common,addEventHandler);
+}] call CBA_fnc_addEventHandler;
 
 #ifdef DEBUG_MODE_FULL
     call FUNC(diagnoseWeapons);

diff --git a/addons/advanced_ballistics/config.cpp b/addons/advanced_ballistics/config.cpp
@@ -6,8 +6,9 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_ballistics", "ace_weather"};
-        author[] = {"Ruthberg"};
-        authorUrl = "https://github.com/ulteq";
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Ruthberg"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@@ -43,13 +43,13 @@ GVAR(Protractor) = true;
 
     __ctrl1 ctrlSetScale 1;
     __ctrl1 ctrlCommit 0;
-    __ctrl1 ctrlSetText QUOTE(PATHTOF(UI\protractor.paa));
+    __ctrl1 ctrlSetText QPATHTOF(UI\protractor.paa);
     __ctrl1 ctrlSetTextColor [1, 1, 1, 1];
 
     __ctrl2 ctrlSetScale 1;
     __ctrl2 ctrlSetPosition [SafeZoneX + 0.001, SafeZoneY - 0.001 - 0.1074 * (-0.86 max ((ACE_player weaponDirection currentWeapon ACE_player) select 2) min 0.86), 0.2, 0.2 * 4/3];
     __ctrl2 ctrlCommit 0;
-    __ctrl2 ctrlSetText QUOTE(PATHTOF(UI\protractor_marker.paa));
+    __ctrl2 ctrlSetText QPATHTOF(UI\protractor_marker.paa);
     __ctrl2 ctrlSetTextColor [1, 1, 1, 1];
 
 }, 0.1, []] call CBA_fnc_addPerFrameHandler;

diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -12,7 +12,7 @@
  */
 #include "script_component.hpp"
 
-private _aceTimeSecond = floor ACE_time;
+private _aceTimeSecond = floor CBA_missionTime;
 
 {
     private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];
@@ -31,7 +31,7 @@ private _aceTimeSecond = floor ACE_time;
             drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
         };
 
-        call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
+        call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, CBA_missionTime - _aceTimeSecond]);
     };
     nil
 } count +GVAR(allBullets);

diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -88,7 +88,7 @@ if (GVAR(ammoTemperatureEnabled) || GVAR(barrelLengthInfluenceEnabled)) then {
 
 _bulletTraceVisible = false;
 if (GVAR(bulletTraceEnabled) && cameraView == "GUNNER") then {
-    if (currentWeapon ACE_player in ["ACE_Vector", "Binocular", "Rangefinder", "Laserdesignator"]) then {
+    if (currentWeapon ACE_player == binocular ACE_player) then {
         _bulletTraceVisible = true;
     } else {
         if (currentWeapon ACE_player == primaryWeapon ACE_player && count primaryWeaponItems ACE_player > 2) then {
@@ -110,8 +110,8 @@ if (_caliber > 0 && _bulletLength > 0 && _bulletMass > 0 && _barrelTwist > 0) th
 
 GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;
 
-_aceTimeSecond = floor ACE_time;
-"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, ACE_time - _aceTimeSecond];
+_aceTimeSecond = floor CBA_missionTime;
+"ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _projectile, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, CBA_missionTime - _aceTimeSecond];
 
 GVAR(allBullets) pushBack [_projectile, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];
 

diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@@ -18,7 +18,7 @@ if (!GVAR(extensionAvailable)) exitWith {};
 
 private ["_initStartTime", "_mapSize", "_mapGrids", "_gridCells", "_x", "_y", "_gridCenter", "_gridHeight", "_gridNumObjects", "_gridSurfaceIsWater"];
 
-_initStartTime = ACE_time;
+_initStartTime = CBA_missionTime;
 _mapSize = getNumber (configFile >> "CfgWorlds" >> worldName >> "MapSize");
 
 if (("ace_advanced_ballistics" callExtension format["init:%1:%2", worldName, _mapSize]) == "Terrain already initialized") exitWith {
@@ -38,7 +38,7 @@ GVAR(currentGrid) = 0;
 
     if (GVAR(currentGrid) >= _gridCells) exitWith {
         #ifdef DEBUG_MODE_FULL
-            systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)];
+            systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(CBA_missionTime - _initStartTime)];
         #endif
         [_idPFH] call CBA_fnc_removePerFrameHandler;
     };

diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp
@@ -6,8 +6,9 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {"KoffeinFlummi","commy2"};
-        authorUrl = "https://github.com/KoffeinFlummi/";
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"KoffeinFlummi","commy2"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp
@@ -11,7 +11,7 @@ class CfgAmmo {
         explosive = 1.8;
         tracersEvery = 3;
         tracerEndTime = 3.5;
-        
+
         CraterEffects = "ExploAmmoCrater";
         explosionEffects = "ExploAmmoExplosion";
         model = "\A3\Weapons_f\Data\bullettracer\tracer_red";

diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp
@@ -860,12 +860,12 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
                 helmetDown[] = {0,-0.07,0};
             };
         };
-    
+
     class Turrets: Turrets {
         class MainTurret: MainTurret {
             weapons[] = {"ACE_gatling_20mm_Comanche","missiles_DAGR","missiles_ASRAAM", "ACE_AIR_SAFETY"};
             magazines[] = {"ACE_500Rnd_20mm_shells_Comanche","4Rnd_AAA_missiles","24Rnd_PG_missiles"};
-            
+
             outGunnerMayFire = 1;
             commanding = -1;
             primaryGunner = 1;
@@ -888,13 +888,13 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
             minTurn = -120;
             maxTurn = 120;
             initTurn = 0;
-            
+
             class OpticsIn
             {
                 delete Narrow;
                 delete Medium;
                 delete Wide;
-                
+
                 class ACE_WideUnstabilized {
                     opticsDisplayName = "W NS";
                     initAngleX = 0;
@@ -994,4 +994,4 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
             weapon = "ACE_gatling_20mm_Comanche";
         };
     };
-};
+};
diff --git a/addons/aircraft/RscInGameUI.hpp b/addons/aircraft/RscInGameUI.hpp
@@ -145,7 +145,7 @@ class RscInGameUI
                     sizeEx = "0.038*SafezoneH";
                     shadow = 0;
                     font = "EtelkaMonospacePro";
-                    text = PATHTOF(data\Helo_LaserON.paa);
+                    text = QPATHTOF(data\Helo_LaserON.paa);
                     x = "20.45 *         (0.01875 * SafezoneH)";
                     y = "14.1 *         (0.025 * SafezoneH)";
                     w = "12.5 *         (0.01875 * SafezoneH)";
@@ -335,7 +335,7 @@ class RscInGameUI
                     shadow = 0;
                     align = "right";
                     font = "EtelkaMonospacePro";
-                    text = PATHTOF(data\Helo_LaserON.paa);
+                    text = QPATHTOF(data\Helo_LaserON.paa);
                     x = "20.45 *         (0.01875 * SafezoneH)";
                     y = "14.1 *         (0.025 * SafezoneH)";
                     w = "12.5 *         (0.01875 * SafezoneH)";

diff --git a/addons/aircraft/config.cpp b/addons/aircraft/config.cpp
@@ -6,8 +6,9 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
-        authorUrl = "https://github.com/KoffeinFlummi/";
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"KoffeinFlummi","Crusty","commy2","jaynus","Kimi"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };

diff --git a/addons/aircraft/flightmodel_thunderbolt.hpp b/addons/aircraft/flightmodel_thunderbolt.hpp
@@ -20,4 +20,3 @@ envelope[] = {0,0,0.75,2.4,3.6,3.8,3.7,3.2,2.2,1.7,0.9};
 thrustCoef[] = {1,1.2,1.3,1.25,1.06,1.01,1,0.92,0.75,0.65,0.5,0.25,0};
 acceleration = 265;
 landingSpeed = 220;
-gunAimDown = 0.087266463;
diff --git a/addons/apl/config.cpp b/addons/apl/config.cpp
@@ -6,8 +6,8 @@ class CfgPatches {
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_main"};
-        author[] = {"Bohemia Interactive"};
-        authorUrl = "http://ace3mod.com";
+        author = "Bohemia Interactive";
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };
diff --git a/addons/atragmx/CfgVehicles.hpp b/addons/atragmx/CfgVehicles.hpp
@@ -9,7 +9,7 @@ class CfgVehicles {
                     statement = QUOTE(call FUNC(create_dialog));
                     showDisabled = 0;
                     priority = 2;
-                    icon = PATHTOF(UI\ATRAG_Icon.paa);
+                    icon = QPATHTOF(UI\ATRAG_Icon.paa);
                     exceptions[] = {"notOnMap", "isNotInside", "isNotSitting"};
                 };
             };

diff --git a/addons/atragmx/CfgWeapons.hpp b/addons/atragmx/CfgWeapons.hpp
@@ -8,8 +8,8 @@ class CfgWeapons {
         scope = 2;
         displayName = CSTRING(Name);
         descriptionShort = CSTRING(Description);
-        model = PATHTOF(data\tdsrecon.p3d);
-        picture = PATHTOF(UI\ATRAG_Icon.paa);
+        model = QPATHTOF(data\tdsrecon.p3d);
+        picture = QPATHTOF(UI\ATRAG_Icon.paa);
         icon = "iconObject_circle";
         mapSize = 0.034;
 

diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp
@@ -230,7 +230,7 @@ class ATragMX_Display {
             idc=-1;
             x=0.55*safezoneW+safezoneX+0.315;
         };
-        
+
         class TEXT_GUN_FRAME: ATragMX_RscText {
             idc=1001;
             style=64;
@@ -610,7 +610,7 @@ class ATragMX_Display {
             x=0.550*safezoneW+safezoneX+0.27;
             text="4";
             action=QUOTE(call FUNC(toggle_solution_setup));
-        };        
+        };
         class TEXT_CALCULATE: TEXT_SCOPE_UNIT {
             idc=3000;
             style=ST_RIGHT;
@@ -1059,7 +1059,7 @@ class ATragMX_Display {
             text="Cancel";
             action=QUOTE(false call FUNC(show_add_new_gun); true call FUNC(show_gun_list));
         };
-        
+
         class TEXT_GUN_AMMO_DATA_BORE_HEIGHT: TEXT_BORE_HEIGHT {
             idc=12000;
             w=0.22;
@@ -1147,7 +1147,7 @@ class ATragMX_Display {
         class TEXT_GUN_AMMO_DATA_NEXT: TEXT_TARGET_SPEED_ASSIST_NEXT {
             idc=12011;
         };
-        
+
         class TEXT_ATMO_ENV_DATA_DEFAULT: TEXT_LEAD {
             idc=13000;
             w=0.08;
@@ -1231,7 +1231,7 @@ class ATragMX_Display {
             y=0.265*safezoneH+safezoneY+0.29;
             text="Calc Method";
         };
-        
+
         class TEXT_TARGET_DATA_LATITUDE: TEXT_BORE_HEIGHT {
             idc=14000;
             w=0.22;
@@ -1379,7 +1379,7 @@ class ATragMX_Display {
         class TEXT_TARGET_DATA_NEXT: TEXT_TARGET_SPEED_ASSIST_NEXT {
             idc=14011;
         };
-        
+
         class TEXT_SOLUTION_SETUP_SHOW_RESULT_IN: TEXT_GUN_AMMO_DATA_BORE_HEIGHT {
             idc=15000;
             style=64;
@@ -1469,4 +1469,4 @@ class ATragMX_Display {
             action=QUOTE(0 call FUNC(toggle_solution_setup));
         };
     };
-};
+};