Merge pull request #1 from acemod/master

Update from original

AUTHORS.txt

@@ -60,6 +60,7 @@ Coren <[email protected]>
 Crusty
 Dharma Bellamkonda <[email protected]>
 Dimaslg <[email protected]>
+diwako
 dixon13 <[email protected]>
 Drill <[email protected]>
 Dudakov aka [OMCB]Kaban <[email protected]>
@@ -115,6 +116,7 @@ OnkelDisMaster <[email protected]>
 Orbis2358 <[email protected]>
 oscarmolinadev
 PaxJaromeMalues <[email protected]>
+PiZZADOX <[email protected]>
 Phyma <[email protected]>
 pokertour
 Professor <[email protected]>

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.12.3-blue.svg?style=flat-square" alt="ACE3 Version">
+        <img src="https://img.shields.io/badge/Version-3.12.5-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">

VERSION

@@ -1 +1 @@
-3.12.3.36
+3.12.5.40

addons/advanced_ballistics/CfgEventHandlers.hpp

@@ -7,12 +7,12 @@ class Extended_PreStart_EventHandlers {
 
 class Extended_PreInit_EventHandlers {
     class ADDON {
-        init = QUOTE( call COMPILE_FILE(XEH_preInit) );
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
     };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        init = QUOTE( call COMPILE_FILE(XEH_postInit) );
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };

addons/advanced_ballistics/stringtable.xml

@@ -90,6 +90,7 @@
             <Chinese>啟用槍口初速變化</Chinese>
             <Chinesesimp>启用枪口初速变化</Chinesesimp>
             <French>Activer les variations de la vitesse initiale</French>
+            <Polish>Aktywuj wariację prędkości wylotowej</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_muzzleVelocityVariationEnabled_Description">
             <English>Simulates slight variations in muzzle velocity between each shot</English>
@@ -100,6 +101,7 @@
             <Chinese>模擬每發子彈的槍口初速都略有不同</Chinese>
             <Chinesesimp>模拟每发子弹的枪口初速都略有不同</Chinesesimp>
             <French>Simule les légères variations</French>
+            <Polish>Symuluje lekkie zmiany w prędkości wylotowej między każdym strzałem</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
             <English>Enable Ammo Temperature Simulation</English>

addons/advanced_fatigue/stringtable.xml

@@ -10,6 +10,7 @@
             <Italian>ACE Fatica Avanzata</Italian>
             <Korean>ACE 고급 피로도</Korean>
             <French>ACE Fatigue Avancée</French>
+            <Polish>ACE Zaawansowane Zmęczenie</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
             <English>Performance Factor</English>
@@ -117,6 +118,7 @@
             <Chinese>抖動因素</Chinese>
             <French>Facteur de stabilisation</French>
             <Italian>Fattore di oscillazione</Italian>
+            <Polish>Czynnik kołysania</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_SwayFactor_Description">
             <English>Influences the amount of weapon sway. Higher means more sway.</English>
@@ -125,6 +127,7 @@
             <Chinese>影響手持武器晃動程度，數值越高抖動越厲害</Chinese>
             <French>Influence les mouvements de l'arme, une valeur plus élevée signifie plus de mouvements</French>
             <Italian>Influenza l'ammontare di oscillazione dell'arma. Maggiore significa più oscillazione.</Italian>
+            <Polish>Wpływa na poziom kołysania broni. Większa ilość znaczy większe kołysanie.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_Enabled">
             <English>Enabled</English>

addons/ai/stringtable.xml

@@ -9,6 +9,7 @@
             <Chinese>提供的位置無效</Chinese>
             <Chinesesimp>提供的位置无效。</Chinesesimp>
             <Korean>위치가 잘못되었습니다.</Korean>
+            <Polish>Podano błędną pozycję.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNoUnits">
             <English>No units provided.</English>
@@ -18,6 +19,7 @@
             <Chinese>找不到可用的單位</Chinese>
             <Chinesesimp>找不到可用的单位。</Chinesesimp>
             <Korean>병력이 없습니다.</Korean>
+            <Polish>Nie podano żadnych jednostek.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNotEnoughPos">
             <English>There aren't enough positions to place all units.</English>
@@ -27,6 +29,7 @@
             <Chinese>沒有足夠的位置能擺放所有單位</Chinese>
             <Chinesesimp>没有足够的位置能摆放所有单位。</Chinesesimp>
             <Korean>모든 병력을 배치 할 공간이 없습니다.</Korean>
+            <Polish>Nie ma wystarczającej ilości pozycji, aby umieścić wszystkie jednostki.</Polish>
         </Key>
         <Key ID="STR_ACE_ai_GarrisonNoBuilding">
             <English>No building found.</English>
@@ -36,6 +39,7 @@
             <Chinese>沒找到建築物</Chinese>
             <Chinesesimp>没找到建筑物。</Chinesesimp>
             <Korean>건물이 없습니다.</Korean>
+            <Polish>Nie znaleziono budynku.</Polish>
         </Key>
     </Package>
 </Project>

addons/apl/model.cfg

@@ -17,4 +17,12 @@ class CfgModels {
         sections[] = {"camo"};
         skeletonName = "";
     };
+    class ace_entrchtool: Default {};
+    class ace_envelope_big: Default {};
+    class ace_envelope_big4: Default {};
+    class ace_envelope_big4_nogeo: Default {};
+    class ace_envelope_small: Default {};
+    class ace_envelope_small4: Default {};
+    class ace_envelope_small4_nogeo: Default {};
+    class LWTS_optic: Default {};
 };

addons/arsenal/defines.hpp

@@ -362,15 +362,16 @@ _buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\
     {(_accsArray select 2) findIf {_x == _item} > -1} ||\
     {(_accsArray select 3) findIf {_x == _item} > -1}
 
-#define CHECK_ASSIGNED_ITEMS\
+// PboProject 2.45 has problems with these macros for some reason, adding a single space before the \ fixes
+#define CHECK_ASSIGNED_ITEMS \
     (GVAR(virtualItems) select 10) findIf {_x == _item} > -1 ||\
     {(GVAR(virtualItems) select 11) findIf {_x == _item} > -1} ||\
     {(GVAR(virtualItems) select 12) findIf {_x == _item} > -1} ||\
     {(GVAR(virtualItems) select 13) findIf {_x == _item} > -1} ||\
     {(GVAR(virtualItems) select 14) findIf {_x == _item} > -1} ||\
     {(GVAR(virtualItems) select 8) findIf {_x == _item} > -1}
 
-#define CHECK_CONTAINER\
+#define CHECK_CONTAINER \
     (GVAR(virtualItems) select 4) findIf {_x == _item} > -1 ||\
     {(GVAR(virtualItems) select 5) findIf {_x == _item} > -1} ||\
     {(GVAR(virtualItems) select 6) findIf {_x == _item} > -1}
@@ -381,7 +382,7 @@ _buttonCurrentMag2Ctrl ctrlCommit FADE_DELAY;\
     {isClass (_glassesCfg >> _item)} ||\
     {isClass (_magCfg >> _item)}
 
-#define CHECK_CONTAINER_ITEMS\
+#define CHECK_CONTAINER_ITEMS \
     (GVAR(virtualItems) select 3) findIf {_x == _item} > -1 ||\
     {(_accsArray select 0) findIf {_x == _item} > -1} ||\
     {(_accsArray select 1) findIf {_x == _item} > -1} ||\

addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf

@@ -124,7 +124,17 @@ switch (GVAR(currentLoadoutsTab)) do {
             };
         };
 
-        if (_loadoutIndex == -1) then {
+        if (GVAR(shiftState) && {is3DEN} && {!(_loadoutName isEqualTo "")} && {_cursSelRow != -1} && {!(_loadoutIndex isEqualto -1)}) exitwith {
+            private _defaultLoadoutsSearch = GVAR(defaultLoadoutsList) findIf {(_x select 0) == _loadoutName};
+            if (_defaultLoadoutsSearch isEqualto -1) then {
+                GVAR(defaultLoadoutsList) pushBack [_loadoutName, _curSelLoadout];
+            } else {
+                GVAR(defaultLoadoutsList) set [_defaultLoadoutsSearch , [ _loadoutName, _curSelLoadout]];
+            };
+            set3DENMissionAttributes [[QGVAR(DummyCategory), QGVAR(DefaultLoadoutsListAttribute), GVAR(defaultLoadoutsList)]];
+        };
+
+        if (_loadoutIndex isEqualto -1) then {
             _data pushBack [_editBoxContent, _loadout];
         } else {
             _data set [_loadoutIndex, [[_editBoxContent, _loadoutName] select (_loadoutName isEqualTo _editBoxContent), _loadout]];

addons/arsenal/functions/fnc_loadoutsChangeTab.sqf

@@ -48,20 +48,23 @@ switch (ctrlIDC _control) do {
     case IDC_buttonMyLoadouts: {
         _centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabMyLoadoutsText));
 
+        if (is3den) then { _saveButtonCtrl ctrlSetTooltip format ["%1\n%2", localize LSTRING(buttonSaveTooltip), localize LSTRING(buttonSaveTooltip_shiftClick)]; };
         _saveButtonCtrl ctrlEnable true;
         _saveButtonCtrl ctrlCommit 0;
     };
 
     case IDC_buttonDefaultLoadouts: {
         _centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabDefaultLoadoutsText));
 
+        if (is3den) then { _saveButtonCtrl ctrlSetTooltip localize LSTRING(buttonSaveTooltip); };
         _saveButtonCtrl ctrlEnable (is3DEN);
         _saveButtonCtrl ctrlCommit 0;
     };
 
     case IDC_buttonSharedLoadouts: {
         _centerBoxTitleCtrl ctrlSetText (localize LSTRING(tabSharedLoadoutsText));
 
+        if (is3den) then { _saveButtonCtrl ctrlSetTooltip localize LSTRING(buttonSaveTooltip); };
         _saveButtonCtrl ctrlEnable false;
         _saveButtonCtrl ctrlCommit 0;
     };

addons/arsenal/functions/fnc_onArsenalClose.sqf

@@ -66,6 +66,11 @@ if (is3DEN) then {
 deleteVehicle GVAR(cameraHelper);
 camDestroy GVAR(camera);
 
+if (!isNil QGVAR(moduleUsed)) then {
+    GVAR(moduleUsed) = nil;
+    objNull remoteControl GVAR(center);
+};
+
 if (isMultiplayer) then {
 
     [QGVAR(broadcastFace), [GVAR(center), GVAR(currentFace)], QGVAR(center) + "_face"] call CBA_fnc_globalEventJIP;

addons/arsenal/functions/fnc_onSelChangedLeft.sqf

@@ -57,7 +57,7 @@ switch (GVAR(currentLeftPanel)) do {
                 call _fnc_clearPreviousWepMags;
 
                 private _compatibleItems = (_item call bis_fnc_compatibleItems) apply {tolower _x};
-                GVAR(center) addWeaponGlobal _item;
+                GVAR(center) addWeapon _item;
                 GVAR(center) addWeaponItem [_item, [(getArray (configfile >> "cfgweapons" >> _item >> "magazines")) select 0]];
 
                 {
@@ -95,7 +95,7 @@ switch (GVAR(currentLeftPanel)) do {
                 call _fnc_clearPreviousWepMags;
 
                 private _compatibleItems = (_item call bis_fnc_compatibleItems) apply {tolower _x};
-                GVAR(center) addWeaponGlobal _item;
+                GVAR(center) addWeapon _item;
                 GVAR(center) addWeaponItem [_item, [(getArray (configfile >> "cfgweapons" >> _item >> "magazines")) select 0]];
 
                 {
@@ -132,7 +132,7 @@ switch (GVAR(currentLeftPanel)) do {
                 call _fnc_clearPreviousWepMags;
 
                 private _compatibleItems = (_item call bis_fnc_compatibleItems) apply {tolower _x};
-                GVAR(center) addWeaponGlobal _item;
+                GVAR(center) addWeapon _item;
                 GVAR(center) addWeaponItem [_item, [(getArray (configfile >> "cfgweapons" >> _item >> "magazines")) select 0]];
 
                 {
@@ -295,7 +295,7 @@ switch (GVAR(currentLeftPanel)) do {
             GVAR(currentItems) set [9, _item];
         } else {
             if ((GVAR(currentItems) select 9) != _item) then {
-                GVAR(center) addWeaponGlobal _item;
+                GVAR(center) addWeapon _item;
                 GVAR(currentItems) set [9, _item];
                 call FUNC(showItem);
                 ADDBINOCULARSMAG

addons/arsenal/functions/fnc_statBarStatement_accuracy.sqf

@@ -18,14 +18,18 @@
 
 params ["_stat", "_config", "_args"];
 _args params ["_statMinMax", "_barLimits"];
+TRACE_4("statBarStatement_accuracy",_stat,_config,_statMinMax,_barLimits);
 
 private _fireModes = getArray (_config >> "modes");
 private _dispersion = [];
 
 {
-    _dispersion pushBackUnique log (getNumber (_config >> _x >> "dispersion"));
+    private _n = log (getNumber (_config >> _x >> "dispersion"));
+    if (!finite _n) then {_n = 0;};
+    _dispersion pushBackUnique _n;
 } foreach _fireModes;
 
 _dispersion sort true;
+TRACE_1("",_dispersion);
 
 linearConversion [_statMinMax select 0, _statMinMax select 1, _dispersion param [0, 0], _barLimits select 0, _barLimits select 1]

addons/arsenal/functions/fnc_statBarStatement_rateOfFIre.sqf

@@ -23,7 +23,9 @@ private _fireModes = getArray (_config >> "modes");
 private _fireRate = [];
 
 {
-    _fireRate pushBackUnique log (getNumber (_config >> _x >> "reloadTime"));
+    private _n = log (getNumber (_config >> _x >> "reloadTime"));
+    if (!finite _n) then {_n = 0;};
+    _fireRate pushBackUnique _n;
 } foreach _fireModes;
 
 _fireRate sort true;

addons/arsenal/functions/fnc_statTextStatement_rateOfFire.sqf

@@ -11,7 +11,7 @@
  *  2.2: Evaluate as a logarithmic number (BOOL)
  *
  * Return Value:
- * Number
+ * String
  *
  * Public: No
 */
@@ -29,4 +29,5 @@ private _fireRate = [];
 _fireRate sort true;
 _fireRate = _fireRate param [0, 0];
 
+if (_fireRate == 0) exitWith {"PEWPEWPEW"};
 format ["%1 rpm", round (60 / _fireRate)]