From ed0823e40f4b26d67f67dd6572a71f4c1dcf8b14 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sat, 25 Jun 2016 21:07:30 -0500
Subject: [PATCH 01/17] Fix UBC for 1.62 Apex

---
 addons/explosives/CfgVehicles.hpp |  2 +-
 addons/smallarms/CfgWeapons.hpp   | 43 ++-----------------------------
 2 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
index b2cd562b18..021d04af92 100644
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@@ -286,7 +286,7 @@ class CfgVehicles {
     class B_Soldier_03_f; class B_engineer_F:B_Soldier_03_f {MACRO_ADDMINEKIT};
     class B_Soldier_diver_base_F; class B_diver_exp_F:B_Soldier_diver_base_F {MACRO_ADDMINEKIT};
     class B_Soldier_recon_base; class B_recon_exp_F:B_Soldier_recon_base {MACRO_ADDMINEKIT};
-    class B_CTRG_soldier_engineer_exp_F:B_Soldier_base_F {MACRO_ADDMINEKIT};
+    class B_Soldier_02_f; class B_CTRG_soldier_engineer_exp_F:B_Soldier_02_f {MACRO_ADDMINEKIT};
     class I_G_Soldier_base_F; class I_G_engineer_F:I_G_Soldier_base_F {MACRO_ADDMINEKIT};
     class I_G_Soldier_exp_F:I_G_Soldier_base_F {MACRO_ADDMINEKIT};
     class B_G_engineer_F:I_G_engineer_F {MACRO_ADDMINEKIT};
diff --git a/addons/smallarms/CfgWeapons.hpp b/addons/smallarms/CfgWeapons.hpp
index 75d8ee6538..1cb7979d5b 100644
--- a/addons/smallarms/CfgWeapons.hpp
+++ b/addons/smallarms/CfgWeapons.hpp
@@ -1,49 +1,10 @@
 class Mode_SemiAuto;
 class Mode_Burst;
 class Mode_FullAuto;
-class MuzzleSlot;
-
-// config inheritance of weapon slot info v1.32
-class SlotInfo;
-class CowsSlot: SlotInfo {};
-class PointerSlot: SlotInfo {
-    //compatibleItems[] = {"acc_flashlight","acc_pointer_IR", "ACE_acc_flashlight_tls"};
-};
 
 class CfgWeapons {
-
-    // config inheritance of weapon slot info v1.32 for launchers
-    class Launcher;
-    class Launcher_Base_F: Launcher {
-        class WeaponSlotsInfo {};
-    };
-
-    // config inheritance of weapon slot info v1.32 for assault rifles
-    class RifleCore;
-    class Rifle: RifleCore {
-        class WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {};
-            class CowsSlot: CowsSlot {};
-            class PointerSlot: PointerSlot {};
-        };
-    };
-    class Rifle_Base_F: Rifle {};
-    class Rifle_Long_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {};
-    };
-
-    // config inheritance of weapon slot info v1.32 for handguns
-    class PistolCore;
-    class Pistol: PistolCore {
-        class WeaponSlotsInfo {
-            class CowsSlot: SlotInfo {};
-        };
-    };
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: SlotInfo {};
-        };
-    };
+    class Rifle_Base_F;
+    class Rifle_Long_Base_F;
 
     ///////////////////////////////////////////////////////////////////////////////
     //////////// SMALL ARMS WEAPONS ///////////////////////////////////////////////

From 0ff0185359d1de25e07acaff92e126e84c44d27b Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sat, 25 Jun 2016 21:57:42 -0500
Subject: [PATCH 02/17] Fix ballisitics and huntir configs

---
 addons/ballistics/CfgWeapons.hpp | 9 ++++-----
 addons/huntir/CfgWeapons.hpp     | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 1cd705f63f..8586aa8216 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -1,7 +1,3 @@
-
-class Single;
-class Burst;
-class FullAuto;
 class Mode_SemiAuto;
 class Mode_Burst;
 class Mode_FullAuto;
@@ -90,7 +86,10 @@ class CfgWeapons {
 
     /* MX */
 
-    class arifle_MX_Base_F: Rifle_Base_F {};
+    class arifle_MX_Base_F: Rifle_Base_F {
+        class Single: Mode_SemiAuto {};
+        class FullAuto: Mode_FullAuto {};
+    };
     class arifle_MX_SW_F: arifle_MX_Base_F {
         magazines[] = {
             "100Rnd_65x39_caseless_mag_Tracer",
diff --git a/addons/huntir/CfgWeapons.hpp b/addons/huntir/CfgWeapons.hpp
index 979fc8875c..799cfcb976 100644
--- a/addons/huntir/CfgWeapons.hpp
+++ b/addons/huntir/CfgWeapons.hpp
@@ -19,11 +19,6 @@ class CfgWeapons {
     class UGL_F: GrenadeLauncher {
         magazines[] += {"ACE_HuntIR_M203"};
     };
-    class GL_3GL_F: UGL_F {
-        //magazines[] += {"ACE_HuntIR_M203"};
-        magazines[] = {"1Rnd_HE_Grenade_shell","UGL_FlareWhite_F","UGL_FlareGreen_F","UGL_FlareRed_F","UGL_FlareYellow_F","UGL_FlareCIR_F","1Rnd_Smoke_Grenade_shell","1Rnd_SmokeRed_Grenade_shell","1Rnd_SmokeGreen_Grenade_shell","1Rnd_SmokeYellow_Grenade_shell","1Rnd_SmokePurple_Grenade_shell","1Rnd_SmokeBlue_Grenade_shell","1Rnd_SmokeOrange_Grenade_shell","3Rnd_HE_Grenade_shell","3Rnd_UGL_FlareWhite_F","3Rnd_UGL_FlareGreen_F","3Rnd_UGL_FlareRed_F","3Rnd_UGL_FlareYellow_F","3Rnd_UGL_FlareCIR_F","3Rnd_Smoke_Grenade_shell","3Rnd_SmokeRed_Grenade_shell","3Rnd_SmokeGreen_Grenade_shell","3Rnd_SmokeYellow_Grenade_shell","3Rnd_SmokePurple_Grenade_shell","3Rnd_SmokeBlue_Grenade_shell","3Rnd_SmokeOrange_Grenade_shell","ACE_HuntIR_M203"};
-    };
-
     class Rifle_Base_F;
     class arifle_MX_Base_F: Rifle_Base_F {
         class GL_3GL_F: UGL_F {

From 3ae8a494c40e23168a30c60eb0e4fdef56695f2d Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 28 Jun 2016 22:46:04 -0500
Subject: [PATCH 03/17] Add javelin configs for new apex launchers

Fix #4007
---
 addons/javelin/CfgWeapons.hpp                    | 6 ++++++
 addons/missileguidance/functions/fnc_onFired.sqf | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/javelin/CfgWeapons.hpp b/addons/javelin/CfgWeapons.hpp
index 868b77c36c..45c8c5942c 100644
--- a/addons/javelin/CfgWeapons.hpp
+++ b/addons/javelin/CfgWeapons.hpp
@@ -38,6 +38,9 @@ class CfgWeapons {
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
     };
+    class launch_B_Titan_short_tna_F: launch_B_Titan_short_F {
+        GVAR(enabled) = 1;
+    };
     class launch_I_Titan_short_F: launch_Titan_short_base {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";
@@ -59,6 +62,9 @@ class CfgWeapons {
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
     };
+    class launch_O_Titan_short_ghex_F: launch_O_Titan_short_F {
+        GVAR(enabled) = 1;
+    };
     class launch_Titan_short_F: launch_Titan_short_base {
         GVAR(enabled) = 1;
         weaponInfoType = "ACE_RscOptics_javelin";
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index e1e966b793..2a263721de 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -70,12 +70,6 @@ if(isNil "_target") then {
     };
 };
 
-//ToDo: Add correct configs for new apex titans (in ace_javelin)
-if ((isNil "_target") && {(_weapon == "launch_B_Titan_short_tna_F") || {_weapon == "launch_O_Titan_short_ghex_F"}}) then {
-    ACE_LOGWARNING_1("APEX Launcher [%1] not supported - Wait for ACE 3.6.1",_weapon);
-    if (!isNull cursorObject) then {_target = cursorObject;}; //Attempt to give some kind of target or it will
-};
-
 TRACE_4("Beginning ACE guidance system",_target,_ammo,_seekerType,_attackProfile);
 _args = [_this,
             [_shooter,

From 96efbaef53babf7338f2af01072b8e31f927f616 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 1 Jul 2016 16:28:44 -0500
Subject: [PATCH 04/17] Add Drag/Drop Keybind

---
 addons/dragging/XEH_postInit.sqf | 27 +++++++++++++++++++++++++++
 addons/dragging/stringtable.xml  | 12 ++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/addons/dragging/XEH_postInit.sqf b/addons/dragging/XEH_postInit.sqf
index 6b2fd02dde..0d8e7757eb 100644
--- a/addons/dragging/XEH_postInit.sqf
+++ b/addons/dragging/XEH_postInit.sqf
@@ -28,3 +28,30 @@ if (isNil "ACE_maxWeightCarry") then {
 ["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
 
 //@todo Captivity?
+
+//Add Keybind:
+["ACE3 Common", QGVAR(drag), (localize LSTRING(DragKeybind)),
+{
+    if (!alive ACE_player) exitWith {false};
+    if !([ACE_player, objNull, ["isNotDragging", "isNotCarrying"]] call EFUNC(common,canInteractWith)) exitWith {false};
+    
+    // If we are drag/carrying something right now then just drop it:
+    if (ACE_player getVariable [QGVAR(isDragging), false]) exitWith {
+        [ACE_player, ACE_player getVariable [QGVAR(draggedObject), objNull]] call FUNC(dropObject);
+        false
+    };
+    if (ACE_player getVariable [QGVAR(isCarrying), false]) exitWith {
+        [ACE_player, ACE_player getVariable [QGVAR(carriedObject), objNull]] call FUNC(dropObject_carry);
+        false
+    };
+
+    private _cursor = cursorObject;
+    if ((isNull _cursor) || {(_cursor distance ACE_player) > 2.6}) exitWith {false};
+    if (!([ACE_player, _cursor] call FUNC(canDrag))) exitWith {false};
+
+    [ACE_player, _cursor] call FUNC(startDrag);
+    false
+},
+{false},
+[-1, [false, false, false]]] call CBA_fnc_addKeybind; // UNBOUND
+
diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index b0334f3ca2..646678e43d 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -25,6 +25,18 @@
             <Italian>Lascia</Italian>
             <Hungarian>Elengedés</Hungarian>
         </Key>
+        <Key ID="STR_ACE_Dragging_DragKeybind">
+            <English>Drag/Release Object</English>
+            <Russian>Тащить/Отпустить Объекты</Russian>
+            <Spanish>Arrastrar/Soltar Objeto</Spanish>
+            <Polish>Ciągnij/Puść Obiekt</Polish>
+            <Czech>Táhnout/Položit Objekt</Czech>
+            <French>Trainer/Lâcher Objets</French>
+            <German>Ziehen/Loslassen Objekt</German>
+            <Portuguese>Arrastar/Soltar Objeto</Portuguese>
+            <Italian>Trascina/Lascia Oggetto</Italian>
+            <Hungarian>Húzás/Elengedés Objektum</Hungarian>
+        </Key>
         <Key ID="STR_ACE_Dragging_UnableToDrag">
             <English>Item too heavy</English>
             <German>Gegenstand ist zu schwer</German>

From d15330d24555d1651ea1e7d7ebebdcca43010283 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Fri, 1 Jul 2016 23:14:20 -0500
Subject: [PATCH 05/17] Fix cargo event name - spare parts not being added

---
 addons/repair/config.cpp                          | 2 +-
 addons/repair/functions/fnc_addSpareParts.sqf     | 2 +-
 addons/zeus/config.cpp                            | 2 +-
 addons/zeus/functions/fnc_moduleAddSpareTrack.sqf | 2 +-
 addons/zeus/functions/fnc_moduleAddSpareWheel.sqf | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/repair/config.cpp b/addons/repair/config.cpp
index dab412eb93..71a990ea73 100644
--- a/addons/repair/config.cpp
+++ b/addons/repair/config.cpp
@@ -25,5 +25,5 @@ class ACE_newEvents {
     setWheelHitPointDamage = QGVAR(setWheelHitPointDamage);
     setVehicleHitPointDamage = QGVAR(setVehicleHitPointDamage);
     setVehicleDamage = QGVAR(setVehicleDamage);
-    AddCargoByClass = "ace_addCargoByClass";
+    AddCargoByClass = "ace_addCargo";
 };
diff --git a/addons/repair/functions/fnc_addSpareParts.sqf b/addons/repair/functions/fnc_addSpareParts.sqf
index 2d133da3c1..971abb571a 100644
--- a/addons/repair/functions/fnc_addSpareParts.sqf
+++ b/addons/repair/functions/fnc_addSpareParts.sqf
@@ -33,4 +33,4 @@ if (!EGVAR(common,settingsInitFinished)) exitWith {
 if (!_force && !GVAR(addSpareParts)) exitWith {};
 
 // Load
-["ace_addCargoByClass", [_part, _vehicle, _amount]] call CBA_fnc_localEvent;
+["ace_addCargo", [_part, _vehicle, _amount]] call CBA_fnc_localEvent;
diff --git a/addons/zeus/config.cpp b/addons/zeus/config.cpp
index 3ec87b637c..4c9a831fd0 100644
--- a/addons/zeus/config.cpp
+++ b/addons/zeus/config.cpp
@@ -58,5 +58,5 @@ class ACE_newEvents {
     zeusUnitAssigned = QGVAR(zeusUnitAssigned);
     SetSurrendered = QEGVAR(captives,setSurrendered);
     SetHandcuffed = QEGVAR(captives,setHandcuffed);
-    AddCargoByClass = "ace_addCargoByClass";
+    AddCargoByClass = "ace_addCargo";
 };
diff --git a/addons/zeus/functions/fnc_moduleAddSpareTrack.sqf b/addons/zeus/functions/fnc_moduleAddSpareTrack.sqf
index 492914eb1c..2926fafcf9 100644
--- a/addons/zeus/functions/fnc_moduleAddSpareTrack.sqf
+++ b/addons/zeus/functions/fnc_moduleAddSpareTrack.sqf
@@ -32,7 +32,7 @@ if !(["ace_cargo"] call EFUNC(common,isModLoaded) && ["ace_repair"] call EFUNC(c
             if (getNumber (configFile >> "CfgVehicles" >> "ACE_Track" >> QEGVAR(cargo,size)) > [_mouseOverUnit] call EFUNC(cargo,getCargoSpaceLeft)) then {
                 [LSTRING(OnlyEnoughCargoSpace)] call EFUNC(common,displayTextStructured);
             } else {
-                ["ace_addCargoByClass", ["ACE_Track", _mouseOverUnit, 1, true]] call CBA_fnc_localEvent;
+                ["ace_addCargo", ["ACE_Track", _mouseOverUnit, 1, true]] call CBA_fnc_localEvent;
             };
         };
     };
diff --git a/addons/zeus/functions/fnc_moduleAddSpareWheel.sqf b/addons/zeus/functions/fnc_moduleAddSpareWheel.sqf
index 105acb2b83..2c051c94b6 100644
--- a/addons/zeus/functions/fnc_moduleAddSpareWheel.sqf
+++ b/addons/zeus/functions/fnc_moduleAddSpareWheel.sqf
@@ -32,7 +32,7 @@ if !(["ace_cargo"] call EFUNC(common,isModLoaded) && ["ace_repair"] call EFUNC(c
             if (getNumber (configFile >> "CfgVehicles" >> "ACE_Wheel" >> QEGVAR(cargo,size)) > [_mouseOverUnit] call EFUNC(cargo,getCargoSpaceLeft)) then {
                 [LSTRING(OnlyEnoughCargoSpace)] call EFUNC(common,displayTextStructured);
             } else {
-                ["ace_addCargoByClass", ["ACE_Wheel", _mouseOverUnit, 1, true]] call CBA_fnc_localEvent;
+                ["ace_addCargo", ["ACE_Wheel", _mouseOverUnit, 1, true]] call CBA_fnc_localEvent;
             };
         };
     };

From bbc708e3e02f48d8bb173fcc7e255e37abed45a8 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sat, 2 Jul 2016 22:46:36 -0500
Subject: [PATCH 06/17] Less aggressive overlap detection

Ensure the 2d screen pos distance is significant.
---
 addons/interact_menu/functions/fnc_renderActionPoints.sqf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
index e30ee55c10..017d3e539b 100644
--- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf
+++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
@@ -159,7 +159,7 @@ if (count GVAR(collectedActionPoints) > 1) then {
             private _delta = vectorNormalized ((GVAR(collectedActionPoints) select _i select 1) vectorDiff (GVAR(collectedActionPoints) select _j select 1));
 
             // If _i is inside a cone with 20º half angle with origin on _j
-            if (_delta select 2 > 0.94) exitWith {
+            if ((_delta select 2 > 0.94) && {((GVAR(collectedActionPoints) select _i select 1) distance2d (GVAR(collectedActionPoints) select _j select 1)) < 0.1}) exitWith {
                 GVAR(collectedActionPoints) deleteAt _i;
             };
         };

From 5ad1f752ca5da178447d55cb0ca7e22dcbdd66f3 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 3 Jul 2016 12:58:40 -0500
Subject: [PATCH 07/17] Fix overheating spare barrels

- Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine
- Don't call updateTemperature in displayTemp, as unit may not be local
- Fix targetEvent error
---
 addons/overheating/CfgWeapons.hpp                  | 11 -----------
 .../functions/fnc_displayTemperature.sqf           | 14 +++++++++-----
 .../functions/fnc_loadCoolestSpareBarrel.sqf       |  2 +-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/addons/overheating/CfgWeapons.hpp b/addons/overheating/CfgWeapons.hpp
index 12cfe6e498..c7a83eec6e 100644
--- a/addons/overheating/CfgWeapons.hpp
+++ b/addons/overheating/CfgWeapons.hpp
@@ -2,17 +2,6 @@ class CfgWeapons {
     class ACE_ItemCore;
     class InventoryItem_Base_F;
 
-    class ACE_SpareBarrel: ACE_ItemCore {
-        displayname = CSTRING(SpareBarrelName);
-        descriptionshort = CSTRING(SpareBarrelDescription);
-        //model = "";
-        picture = QPATHTOF(UI\spare_barrel_ca.paa);
-        scope = 2;
-        class ItemInfo: InventoryItem_Base_F {
-            mass = 30;
-        };
-    };
-
     class RifleCore;
     class Rifle: RifleCore {
         //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp)
diff --git a/addons/overheating/functions/fnc_displayTemperature.sqf b/addons/overheating/functions/fnc_displayTemperature.sqf
index b2b8d2b4c0..e829b61f57 100644
--- a/addons/overheating/functions/fnc_displayTemperature.sqf
+++ b/addons/overheating/functions/fnc_displayTemperature.sqf
@@ -3,7 +3,7 @@
  * Displays the weapon temperature
  *
  * Arguments:
- * 0: Player <OBJECT>
+ * 0: Unit <OBJECT>
  * 1: Weapon <STRING>
  *
  * Return Values:
@@ -16,11 +16,13 @@
  */
 #include "script_component.hpp"
 
-params ["_player", "_weapon"];
-TRACE_2("params",_player,_weapon);
+params ["_unit", "_weapon"];
+TRACE_2("params",_unit,_weapon);
+
+// Get unit's weapon's temperature:
+private _tempVarName = format [QGVAR(%1_temp), _weapon];
+private _temperature = _unit getVariable [_tempVarName, 0];
 
-// Calculate cool down of weapon since last shot
-private _temperature = [_player, _weapon, 0] call FUNC(updateTemperature);
 private _scaledTemperature = (_temperature / 1000) min 1;
 
 private _color = [
@@ -41,6 +43,8 @@ for "_a" from (_count + 1) to 12 do {
     _string = _string + "|";
 };
 
+TRACE_3("",_temperature,_color,_string);
+
 _text = composeText [_text, [_string, [0.5, 0.5, 0.5]] call EFUNC(common,stringToColoredText)];
 
 private _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
diff --git a/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf b/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
index d6a9ccfe37..5f0b3ae3a9 100644
--- a/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
+++ b/addons/overheating/functions/fnc_loadCoolestSpareBarrel.sqf
@@ -50,4 +50,4 @@ _gunner setVariable [format [QGVAR(%1_temp), _weapon], _coolestTemp, true];
 [GVAR(storedSpareBarrels), _coolestMag, [_weaponTemp, CBA_missionTime, _barrelMass]] call CBA_fnc_hashSet;
 
 // Send an event so the machines of the assistant and gunner can show the hint
-[QGVAR(showWeaponTemperature), _gunner], [_gunner, _weapon], [_assistant] call CBA_fnc_targetEvent;
+[QGVAR(showWeaponTemperature), [_gunner, _weapon], [_assistant, _gunner]] call CBA_fnc_targetEvent;

From 0a5a4d2d33adb69e6c50ab2ea44406d3a517e304 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 3 Jul 2016 20:42:43 +0200
Subject: [PATCH 08/17] Fix German word order / capitalization

---
 addons/dragging/stringtable.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/dragging/stringtable.xml b/addons/dragging/stringtable.xml
index 646678e43d..94757299cc 100644
--- a/addons/dragging/stringtable.xml
+++ b/addons/dragging/stringtable.xml
@@ -32,7 +32,7 @@
             <Polish>Ciągnij/Puść Obiekt</Polish>
             <Czech>Táhnout/Položit Objekt</Czech>
             <French>Trainer/Lâcher Objets</French>
-            <German>Ziehen/Loslassen Objekt</German>
+            <German>Objekt ziehen/loslassen</German>
             <Portuguese>Arrastar/Soltar Objeto</Portuguese>
             <Italian>Trascina/Lascia Oggetto</Italian>
             <Hungarian>Húzás/Elengedés Objektum</Hungarian>

From ea140f63a5fcbda49eaf9cb4bc65e6f1db6a093e Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Sun, 3 Jul 2016 15:17:00 -0500
Subject: [PATCH 09/17] Refuel - Simplify Actions, Fix Van_01 config

---
 addons/refuel/CfgVehicles.hpp  | 30 +++++++++++++++---------------
 addons/refuel/XEH_postInit.sqf | 13 +++++++++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp
index 6774140cc7..c8af4268c4 100644
--- a/addons/refuel/CfgVehicles.hpp
+++ b/addons/refuel/CfgVehicles.hpp
@@ -52,21 +52,13 @@
 #define MACRO_CONNECT_ACTIONS \
     class ACE_Actions { \
         class ACE_MainActions { \
-            class GVAR(Refuel) { \
-                displayName = CSTRING(Refuel); \
+            class GVAR(Refuel_Connect) { \
+                displayName = CSTRING(Connect); \
                 distance = REFUEL_ACTION_DISTANCE; \
-                condition = "true"; \
-                statement = ""; \
-                showDisabled = 0; \
-                priority = 2; \
+                condition = QUOTE([ARR_2(_player,_target)] call FUNC(canConnectNozzle)); \
+                statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
                 icon = QPATHTOF(ui\icon_refuel_interact.paa); \
-                class GVAR(Connect) { \
-                    displayName = CSTRING(Connect); \
-                    condition = QUOTE([ARR_2(_player,_target)] call FUNC(canConnectNozzle)); \
-                    statement = QUOTE([ARR_2(_player,_target)] call DFUNC(connectNozzle)); \
-                    exceptions[] = {"isNotInside"}; \
-                    icon = QPATHTOF(ui\icon_refuel_interact.paa); \
-                }; \
+                exceptions[] = {"isNotInside"}; \
             }; \
         }; \
     };
@@ -76,6 +68,7 @@
         class ACE_MainActions { \
             displayName = CSTRING(Refuel); \
             distance = REFUEL_ACTION_DISTANCE; \
+            position = "[0,-0.025,0.125]"; \
             condition = "true"; \
             statement = ""; \
             showDisabled = 0; \
@@ -318,13 +311,20 @@ class CfgVehicles {
         GVAR(fuelCapacity) = 80;
     };
 
-    class Van_01_fuel_base_F: Van_01_base_F {
+    class Van_01_fuel_base_F: Van_01_base_F {};
+    class C_Van_01_fuel_F: Van_01_fuel_base_F {
         transportFuel = 0; //1k
         MACRO_REFUEL_ACTIONS
         GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
         GVAR(fuelCargo) = 2000;
     };
-
+    class I_G_Van_01_fuel_F: Van_01_fuel_base_F {
+        transportFuel = 0; //1k
+        MACRO_REFUEL_ACTIONS
+        GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
+        GVAR(fuelCargo) = 2000;
+    };
+    
     class Tank_F: Tank {
         GVAR(fuelCapacity) = 1200;
     };
diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf
index 8c28464287..89a1f3dc45 100644
--- a/addons/refuel/XEH_postInit.sqf
+++ b/addons/refuel/XEH_postInit.sqf
@@ -9,3 +9,16 @@ if (isServer) then {
 [QGVAR(resetLocal), {
     _this call FUNC(resetLocal);
 }] call CBA_fnc_addEventHandler;
+
+
+#ifdef DEBUG_MODE_FULL
+diag_log text format ["[ACE-refuel] Showing CfgVehicles with vanilla transportFuel"];
+private _fuelTrucks = configProperties [configFile >> "CfgVehicles", "(isClass _x) && {(getNumber (_x >> 'transportFuel')) > 0}", true];
+{
+    if ((configName _x) isKindOf "Car") then {
+        diag_log text format ["Car [%1] needs config [fuel: %2]", configName _x, getNumber (_x >> 'transportFuel')];
+    } else {
+        diag_log text format ["Non-car? [%1] needs config [fuel: %2]", configName _x, getNumber (_x >> 'transportFuel')];
+    };
+} forEach _fuelTrucks;
+#endif

From e40415b6284689250c6a8898e7d8e57f4b3c0544 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Mon, 4 Jul 2016 01:17:30 -0500
Subject: [PATCH 10/17] Add #undef for PREP w/ DISABLE_COMPILE_CACHE

---
 addons/main/script_macros.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
index c7997dee28..05db6cd146 100644
--- a/addons/main/script_macros.hpp
+++ b/addons/main/script_macros.hpp
@@ -84,6 +84,7 @@
 #define TYPE_BACKPACK 901
 
 #ifdef DISABLE_COMPILE_CACHE
+    #undef PREP
     #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QPATHTOF(functions\DOUBLES(fnc,fncName).sqf)
 #else
     #undef PREP

From 8a572ace410b57de7570cf7d0ce8604581b73216 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Mon, 4 Jul 2016 15:31:25 -0500
Subject: [PATCH 11/17] Make ace news fit apex menu style

---
 addons/optionsmenu/gui/aceMenuIcon_ca.paa   | Bin 0 -> 22016 bytes
 addons/optionsmenu/gui/define.hpp           |   5 +
 addons/optionsmenu/gui/pauseMenu.hpp        | 122 ++++++++++++--------
 addons/optionsmenu/init_loadMainMenuBox.sqf |  19 +--
 4 files changed, 90 insertions(+), 56 deletions(-)
 create mode 100644 addons/optionsmenu/gui/aceMenuIcon_ca.paa

diff --git a/addons/optionsmenu/gui/aceMenuIcon_ca.paa b/addons/optionsmenu/gui/aceMenuIcon_ca.paa
new file mode 100644
index 0000000000000000000000000000000000000000..0e3c1853e2a8ce34303cb0b6d79a887fbd154ab1
GIT binary patch
literal 22016
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

literal 0
HcmV?d00001

diff --git a/addons/optionsmenu/gui/define.hpp b/addons/optionsmenu/gui/define.hpp
index c2b1faf9cf..9620bdd7e6 100644
--- a/addons/optionsmenu/gui/define.hpp
+++ b/addons/optionsmenu/gui/define.hpp
@@ -12,6 +12,11 @@ class RscHTML;
 class RscText;
 
 
+class RscControlsGroupNoHScrollbars;
+class RscPicture;
+class RscButtonMenu;
+
+
 #ifndef ACE_DEFINE_H
 #define ACE_DEFINE_H
 
diff --git a/addons/optionsmenu/gui/pauseMenu.hpp b/addons/optionsmenu/gui/pauseMenu.hpp
index 34f368df4a..e3a283d2c7 100644
--- a/addons/optionsmenu/gui/pauseMenu.hpp
+++ b/addons/optionsmenu/gui/pauseMenu.hpp
@@ -108,62 +108,90 @@ class RscDisplayMain: RscStandardDisplay {
             idc = 80085;
         };
 
-        class ACE_news: RscControlsGroupNoScrollbars {
-            idc = 80086;
-            x = "safezoneX + safezoneW - (16 *(((safezoneW / safezoneH) min 1.2) / 40))";
-            y = "safezoneY + (18.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25))";
-            w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)";
-            h = "4.95 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-            class controls {
-                class ACE_NewsTitle: RscText {
-                    text = CSTRING(aceNews);
-                    colorBackground[] = {(162/255),(28/255),(28/255),0.8};
-                    idc = -1;
-                    x = "0 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    y = "0 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    w = "15 *(((safezoneW / safezoneH) min 1.2) / 40)";
-                    h = "1 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                };
-                class ACE_VersionInfo: RscText {
-                    idc = 68;
-                    x = "0 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    y = "1.1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    colorBackground[] = {0,0,0,0.5};
-                };
-                class ACE_NewsBackground: RscText {
-                    idc = -1;
-                    x = "0 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    y = "2.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    h = "5.75 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    colorBackground[] = {0,0,0,0.5};
-                };
-                class ACE_NewsText: RscHTML {
-                    idc = 69;
-                    x = "0.5 * (((safezoneW / safezoneH) min 1.2) / 40)";
-                    y = "2.2 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
-                    w = "14 *  (((safezoneW / safezoneH) min 1.2) / 40)";
-                    h = "2.75 *((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
 
+        class ACE_news_apex: RscControlsGroupNoHScrollbars {
+            idc = 80090;
+            x = "safezoneX + safezoneW - 10 * (pixelW * pixelGrid * 2) - (4 * pixelH)";
+            y = "safezoneY + safezoneH - (3 * 2 + 1) * (pixelH * pixelGrid * 2) - 3 * (4 * pixelH)";
+            w = "10 * (pixelW * pixelGrid * 2)";
+            h = "2 * (pixelH * pixelGrid * 2)";
+            class Controls {
+                class Background: RscPicture {
+                    idc = 80091;
+                    text = "\a3\Ui_f\data\GUI\Rsc\RscDisplayMain\gradientMods_ca.paa";
+                    colorText[] = {0,0,0,0.75};
+                    x = "(10 - 4 * 2) * (pixelW * pixelGrid * 2)";
+                    y = 0;
+                    w = "4 * 2 * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 2)";
+                    angle = 180;
+                };
+                class BackgroundIcon: RscPicture {
+                    idc = 80092;
+                    text = "\a3\Ui_f\data\GUI\Rsc\RscDisplayMain\backgroundModsIcon_ca.paa";
+                    colorText[] = {0,0,0,0.75};
+                    x = "(10 - 2 * 2) * (pixelW * pixelGrid * 2)";
+                    y = 0;
+                    w = "2 * 2 * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 2)";
+                    angle = 180;
+                };
+                class Icon: RscPicture {
+                    idc = 80093;
+                    text = QPATHTOF(gui\aceMenuIcon_ca.paa);
+                    colorText[] = {1,1,1,0.5};
+                    x = "(10 - 2) * (pixelW * pixelGrid * 2)";
+                    y = 0;
+                    w = "2 * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 2)";
+                };
+                class CurrentVersionInfo: RscText {
+                    idc = 80094;
+                    style = 1;
+                    text = "";
+                    sizeEx = "(pixelH * pixelGrid * 1.5)";
+                    font = "RobotoCondensedLight";
+                    shadow = 1;
+                    colorBackground[] = {0,0,0,0};
+                    x = 0;
+                    y = 0;
+                    w = "(10 - 1.25 * 2) * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 1)";
+                    onLoad = "(_this select 0) ctrlenable false;";
+                };
+                class HTTPVersionInfo: RscHTML {
+                    idc = 80095;
                     shadow = 0;
                     class H1 {
-                        font = "RobotoCondensed";
+                        sizeEx = "(pixelH * pixelGrid * 1.5)";
+                        font = "RobotoCondensedLight";
                         fontBold = "RobotoCondensedLight";
-                        sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.4)";
+                        align = "right";
                     };
                     class H2: H1 {
-                        sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1.2)";
-                        font = "RobotoCondensedLight";
+                        sizeEx = "(pixelH * pixelGrid * 1.5)";
                     };
                     class P: H1 {
-                        sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
-                        fontBold = "RobotoCondensedLight";
+                        sizeEx = "(pixelH * pixelGrid * 1.5)";
                     };
-                    colorBold[] = {0.6,0.6,0.6,1};
-                    colorLink[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])",1};
-                    colorLinkActive[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])",1};
+                    x = 0;
+                    y = "2 * (pixelH * pixelGrid * 1)";
+                    w = "(10 - 1.25 * 2) * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 1)";
+                    onLoad = "(_this select 0) ctrlenable false;";
+                };
+                class Button: RscButtonMenu {
+                    idc = 80096;
+                    colorBackground[] = {0,0,0,0};
+                    colorBackgroundFocused[] = {0,0,0,0};
+                    colorBackground2[] = {0,0,0,0};
+                    x = 0;
+                    y = 0;
+                    w = "10 * (pixelW * pixelGrid * 2)";
+                    h = "2 * (pixelH * pixelGrid * 2)";
+
+                    tooltip = "Download latest and report issues:";
+                    url = "https://github.com/acemod/ACE3";
                 };
             };
         };
diff --git a/addons/optionsmenu/init_loadMainMenuBox.sqf b/addons/optionsmenu/init_loadMainMenuBox.sqf
index 9c556e5128..a9b8f5a02a 100644
--- a/addons/optionsmenu/init_loadMainMenuBox.sqf
+++ b/addons/optionsmenu/init_loadMainMenuBox.sqf
@@ -15,17 +15,18 @@
  */
 #include "script_component.hpp"
 
-if (missionNamespace getVariable [QGVAR(newsLoaded), false]) exitWith {};
-GVAR(newsLoaded) = true;
-
 //Need to load from profileNamespace because ace_settings might not be init if world = empty
 if (profileNamespace getVariable [QGVAR(showNewsOnMainMenu), true]) then {
-    ((_this select 0) displayCtrl 80086) ctrlShow true;
+    ((_this select 0) displayCtrl 80090) ctrlShow true;
 
-    private ["_version"];
-    _version = getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr");
-    ((_this select 0) displayCtrl 68) ctrlSetText format ["Installed Version: %1", _version];
-    ((_this select 0) displayCtrl 69) htmlLoad "http://ace3mod.com/version.html";
+    private _ace3VersionStr = (getText (configFile >> "CfgPatches" >> "ace_main" >> "versionStr")) select [0,5];
+    ((_this select 0) displayCtrl 80094) ctrlSetText format ["Version: %1", _ace3VersionStr];
+    ((_this select 0) displayCtrl 80095) htmlLoad "http://ace3mod.com/version.html";
 } else {
-    ((_this select 0) displayCtrl 80086) ctrlShow false;
+    ((_this select 0) displayCtrl 80090) ctrlShow false;
 };
+
+/*
+Note: switch version.html to simpler format and right align
+<h1 align="right">Latest: {{site.ace.version.major}}.{{site.ace.version.minor}}.{{site.ace.version.patch}}</h1>
+*/

From 6c732bf7897495a3b69804e3fe17d8e31ac193af Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 5 Jul 2016 00:22:47 -0500
Subject: [PATCH 12/17] Fix action name, put actions on base class

---
 addons/refuel/CfgVehicles.hpp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp
index c8af4268c4..dd7499a69a 100644
--- a/addons/refuel/CfgVehicles.hpp
+++ b/addons/refuel/CfgVehicles.hpp
@@ -52,7 +52,7 @@
 #define MACRO_CONNECT_ACTIONS \
     class ACE_Actions { \
         class ACE_MainActions { \
-            class GVAR(Refuel_Connect) { \
+            class GVAR(Connect) { \
                 displayName = CSTRING(Connect); \
                 distance = REFUEL_ACTION_DISTANCE; \
                 condition = QUOTE([ARR_2(_player,_target)] call FUNC(canConnectNozzle)); \
@@ -311,18 +311,16 @@ class CfgVehicles {
         GVAR(fuelCapacity) = 80;
     };
 
-    class Van_01_fuel_base_F: Van_01_base_F {};
-    class C_Van_01_fuel_F: Van_01_fuel_base_F {
-        transportFuel = 0; //1k
+    class Van_01_fuel_base_F: Van_01_base_F {
         MACRO_REFUEL_ACTIONS
         GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
         GVAR(fuelCargo) = 2000;
     };
+    class C_Van_01_fuel_F: Van_01_fuel_base_F {
+        transportFuel = 0; //1k
+    };
     class I_G_Van_01_fuel_F: Van_01_fuel_base_F {
         transportFuel = 0; //1k
-        MACRO_REFUEL_ACTIONS
-        GVAR(hooks)[] = {{0.38,-3.17,-.7},{-0.41,-3.17,-.7}};
-        GVAR(fuelCargo) = 2000;
     };
     
     class Tank_F: Tank {

From bd2a06386181d0a88443a1db80f37d50facbb4d1 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas@users.noreply.github.com>
Date: Tue, 5 Jul 2016 23:01:25 +0200
Subject: [PATCH 13/17] Fix pboProject false/true becoming 0/1 in UI config,
 Default ammoCount to off (#4041)

---
 addons/fcs/ACE_UI.hpp      | 2 +-
 addons/reload/ACE_UI.hpp   | 2 +-
 addons/ui/ACE_Settings.hpp | 2 +-
 addons/ui/CfgVehicles.hpp  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/fcs/ACE_UI.hpp b/addons/fcs/ACE_UI.hpp
index ca35779f36..9423e49656 100644
--- a/addons/fcs/ACE_UI.hpp
+++ b/addons/fcs/ACE_UI.hpp
@@ -1,7 +1,7 @@
 class ACE_UI {
     class gunnerZeroing {
         class conditions {
-            ADDON = "false";
+            ADDON = "(false)";
         };
     };
 };
diff --git a/addons/reload/ACE_UI.hpp b/addons/reload/ACE_UI.hpp
index 6dae3e5147..8164d04b17 100644
--- a/addons/reload/ACE_UI.hpp
+++ b/addons/reload/ACE_UI.hpp
@@ -1,7 +1,7 @@
 class ACE_UI {
     class ammoCount {
         class conditions {
-            ADDON = "false";
+            ADDON = "(false)";
         };
     };
 };
diff --git a/addons/ui/ACE_Settings.hpp b/addons/ui/ACE_Settings.hpp
index e6c3e5e496..c02d5be2b6 100644
--- a/addons/ui/ACE_Settings.hpp
+++ b/addons/ui/ACE_Settings.hpp
@@ -83,7 +83,7 @@ class ACE_Settings {
         displayName = CSTRING(AmmoCount);
         description = CSTRING(RequiresSoldierVehicleWeaponInfo);
         typeName = "BOOL";
-        value = 1;
+        value = 0;
         isClientSettable = 1;
     };
     class GVAR(magCount) {
diff --git a/addons/ui/CfgVehicles.hpp b/addons/ui/CfgVehicles.hpp
index 0b1cc9b2a9..563cf22ce1 100644
--- a/addons/ui/CfgVehicles.hpp
+++ b/addons/ui/CfgVehicles.hpp
@@ -73,7 +73,7 @@ class CfgVehicles {
                 displayName = CSTRING(AmmoCount);
                 description = CSTRING(RequiresSoldierVehicleWeaponInfo);
                 typeName = "BOOL";
-                defaultValue = 1;
+                defaultValue = 0;
             };
             class magCount {
                 displayName = CSTRING(MagCount);

From 022e7747b121e968cd103b996163999d5a2549c2 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Tue, 5 Jul 2016 20:58:32 -0500
Subject: [PATCH 14/17] Fix no attack profile on static titan launcher (#4023)

---
 addons/javelin/functions/fnc_cycleFireMode.sqf | 6 +++---
 addons/javelin/functions/fnc_onOpticDraw.sqf   | 2 +-
 addons/javelin/functions/fnc_onOpticLoad.sqf   | 6 ++++--
 addons/javelin/functions/fnc_showFireMode.sqf  | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/javelin/functions/fnc_cycleFireMode.sqf b/addons/javelin/functions/fnc_cycleFireMode.sqf
index d14c0cdee5..50609b3468 100644
--- a/addons/javelin/functions/fnc_cycleFireMode.sqf
+++ b/addons/javelin/functions/fnc_cycleFireMode.sqf
@@ -2,12 +2,12 @@
 #include "script_component.hpp"
 TRACE_1("enter", _this);
 
-private["_player", "_currentFireMode"];
+private _currentShooter = if (ACE_player call CBA_fnc_canUseWeapon) then {ACE_player} else {vehicle ACE_player};
+private _currentFireMode = _currentShooter getVariable["ace_missileguidance_attackProfile", "JAV_TOP"];
 
-_currentFireMode = ACE_player getVariable["ace_missileguidance_attackProfile", "JAV_TOP"];
 if(_currentFireMode == "JAV_DIR") then {
     _currentFireMode = "JAV_TOP";
 } else {
     _currentFireMode = "JAV_DIR";
 };
-ACE_player setVariable["ace_missileguidance_attackProfile", _currentFireMode, false];
+_currentShooter setVariable["ace_missileguidance_attackProfile", _currentFireMode, false];
diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf
index 20606dc4dd..7d1bf64b33 100644
--- a/addons/javelin/functions/fnc_onOpticDraw.sqf
+++ b/addons/javelin/functions/fnc_onOpticDraw.sqf
@@ -11,7 +11,7 @@ private["_firedEH", "_fov", "_lastTick", "_lockTime", "_maxX", "_maxY", "_minX",
 private["_offsetX", "_offsetY", "_pos", "_randomLockInterval", "_randomPosWithinBounds", "_range"];
 private["_runTime", "_soundTime", "_targetArray", "_zamerny", "_currentShooter"];
 
-_currentShooter = (vehicle ACE_player);
+_currentShooter = if (ACE_player call CBA_fnc_canUseWeapon) then {ACE_player} else {vehicle ACE_player};
 
 #define __OffsetX ((ctrlPosition __JavelinIGUITargetingLineV) select 0) - 0.5
 #define __OffsetY ((ctrlPosition __JavelinIGUITargetingLineH) select 1) - 0.5
diff --git a/addons/javelin/functions/fnc_onOpticLoad.sqf b/addons/javelin/functions/fnc_onOpticLoad.sqf
index b75f391112..5148ca983f 100644
--- a/addons/javelin/functions/fnc_onOpticLoad.sqf
+++ b/addons/javelin/functions/fnc_onOpticLoad.sqf
@@ -2,13 +2,15 @@
 #include "script_component.hpp"
 TRACE_1("enter", _this);
 
-#define __LOCKONTIMERANDOM 2    // Deviation in lock on time
+#define __LOCKONTIMERANDOM 1    // Deviation in lock on time
 
 if((count _this) > 0) then {
     uiNameSpace setVariable ['ACE_RscOptics_javelin',_this select 0];
 };
 
-ACE_player setVariable ["ace_missileguidance_target",nil, false];
+private _currentShooter = if (ACE_player call CBA_fnc_canUseWeapon) then {ACE_player} else {vehicle ACE_player};
+TRACE_2("shooter",_currentShooter,typeOf _currentShooter);
+_currentShooter setVariable ["ace_missileguidance_target", nil, false];
 
 __JavelinIGUISeek ctrlSetTextColor __ColorGray;
 __JavelinIGUINFOV ctrlSetTextColor __ColorGray;
diff --git a/addons/javelin/functions/fnc_showFireMode.sqf b/addons/javelin/functions/fnc_showFireMode.sqf
index 5b4f8d7814..95dd038b92 100644
--- a/addons/javelin/functions/fnc_showFireMode.sqf
+++ b/addons/javelin/functions/fnc_showFireMode.sqf
@@ -2,13 +2,13 @@
 #include "script_component.hpp"
 TRACE_1("enter", _this);
 
-private["_player", "_currentFireMode"];
+private _currentShooter = if (ACE_player call CBA_fnc_canUseWeapon) then {ACE_player} else {vehicle ACE_player};
+private _currentFireMode = _currentShooter getVariable ["ace_missileguidance_attackProfile", "JAV_TOP"];
 
-_currentFireMode = ACE_player getVariable["ace_missileguidance_attackProfile", "JAV_TOP"];
 if(_currentFireMode == "JAV_TOP") then {
     __JavelinIGUITop ctrlSetTextColor __ColorGreen;
     __JavelinIGUIDir ctrlSetTextColor __ColorGray;
 } else {
     __JavelinIGUITop ctrlSetTextColor __ColorGray;
     __JavelinIGUIDir ctrlSetTextColor __ColorGreen;
-};
\ No newline at end of file
+};

From 450b8dfedb61f6110beea3bffdc20941d98859fc Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 6 Jul 2016 00:54:51 -0500
Subject: [PATCH 15/17] Fix order of revive loop

Fix #4035
Revive loop was killing heartrate before it exited
---
 addons/medical/functions/fnc_reviveStateLoop.sqf | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/medical/functions/fnc_reviveStateLoop.sqf b/addons/medical/functions/fnc_reviveStateLoop.sqf
index bfc55ae6d8..5dcaad09c4 100644
--- a/addons/medical/functions/fnc_reviveStateLoop.sqf
+++ b/addons/medical/functions/fnc_reviveStateLoop.sqf
@@ -21,13 +21,6 @@ if (!local _unit) exitWith {};
 
 private _startTime = _unit getVariable [QGVAR(reviveStartTime), 0];
 
-// Remove heartbeat
-if (GVAR(level) >= 2) then {
-    if (_unit getVariable [QGVAR(heartRate), 60] > 0) then {
-        _unit setVariable [QGVAR(heartRate), 0];
-    };
-};
-
 // If we are in revive state in a blown up vehicle, try to unload so that people can access the body
 if ((alive _unit) && {(vehicle _unit) != _unit} && {!alive (vehicle _unit)}) then {
     TRACE_2("Unloading", _unit, vehicle _unit);
@@ -52,5 +45,12 @@ if !(_unit getVariable [QGVAR(inReviveState), false]) exitwith {
     _unit setVariable [QGVAR(reviveStartTime), nil];
 };
 
+// Remove heartbeat
+if (GVAR(level) >= 2) then {
+    if (_unit getVariable [QGVAR(heartRate), 60] > 0) then {
+        _unit setVariable [QGVAR(heartRate), 0];
+    };
+};
+
 // Schedule the loop to be executed again 1 sec later
 [DFUNC(reviveStateLoop), [_unit], 1] call CBA_fnc_waitAndExecute;

From 5362a809111efdf0ebfdecbb421540907cd0cb3e Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 6 Jul 2016 16:55:54 -0500
Subject: [PATCH 16/17] Tweak spotting scope anims / mem points

---
 addons/spottingscope/CfgVehicles.hpp          |   8 ++++----
 .../spottingscope/data/ace_spottingscope.p3d  | Bin 4040306 -> 4040306 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/spottingscope/CfgVehicles.hpp b/addons/spottingscope/CfgVehicles.hpp
index f86b9d16c7..84ce5f177f 100644
--- a/addons/spottingscope/CfgVehicles.hpp
+++ b/addons/spottingscope/CfgVehicles.hpp
@@ -70,8 +70,8 @@ class CfgVehicles {
         model = QPATHTOF(data\ace_spottingscope.p3d);
         mapSize = 0.5;
         transportSoldier = 0;
-        getInAction = "GetInLow";
-        getOutAction = "GetOutLow";
+        getInAction = "PlayerProne";
+        getOutAction = "PlayerProne";
         editorSubcategory = "EdSubcat_Turrets";
 
         class Turrets: Turrets {
@@ -115,8 +115,8 @@ class CfgVehicles {
                 gunnerOutOpticsShowCursor = 0;
                 gunnerOpticsShowCursor = 0;
                 gunnerAction = "ACE_SpottingScope";
-                gunnerGetInAction = "GetInLow";
-                gunnerGetOutAction = "GetOutLow";
+                gunnerGetInAction = "PlayerProne";
+                gunnerGetOutAction = "PlayerProne";
                 gunnerForceOptics = 0;
                 ejectDeadGunner = 0;
                 turretInfoType = QGVAR(RscUnitInfo);
diff --git a/addons/spottingscope/data/ace_spottingscope.p3d b/addons/spottingscope/data/ace_spottingscope.p3d
index 0afe9952cfba14efb304cb825c197ad409531a5e..969d0b37f51582e600fb5f12bf3ba7fecedfa141 100644
GIT binary patch
delta 162
zcmWl|#|?sD0Dw_Y!Hx|JiV8ODy(>#N#Gkl@hwq4I7BO)Nr@_Rt`jQvCK63DTLncI+
z2ns4uV#G<1Bt;sH3|VsIDWFrNM41W(Rce^jY0$*NrbU|$U3xh588BqTm<dy6%vrEx
m#hMLUcI-KD<iz>m>Yjf!ZB3CRA%yRE?pu}q<fnCaFUA+K$26e;

delta 171
zcmYkwITFEO06<~CCH7bnB-U7C-`5a_a3aMkqf#hb!;B+noF-<}=)9S)dG7Nq+^-`7
zFFyPPkO&eYOoS*g;>aXOk|K?QN`@>sG<5P5C{m(K1%oOz>NIH5!lX@yE<O4T7&2na
pgef!TELgH)%?67tyPK^#igkVLJ%62L?P5CiOA_LD@5aeK=pSO#G{yh`


From 0220b5760982c9eea236b6f03fb9e639a50e4433 Mon Sep 17 00:00:00 2001
From: jonpas <jonpas33@gmail.com>
Date: Thu, 7 Jul 2016 20:16:03 +0200
Subject: [PATCH 17/17] Remove redundant getMagazineIndex compatibility
 function

---
 addons/overheating/XEH_preInit.sqf | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/addons/overheating/XEH_preInit.sqf b/addons/overheating/XEH_preInit.sqf
index cdd1fa78dd..a7feade1c3 100644
--- a/addons/overheating/XEH_preInit.sqf
+++ b/addons/overheating/XEH_preInit.sqf
@@ -4,16 +4,4 @@ ADDON = false;
 
 #include "XEH_PREP.hpp"
 
-if (isNil "CBA_fnc_getMagazineIndex") then {
-    CBA_fnc_getMagazineIndex = {
-        params [["_unit", objNull, [objNull]], ["_magazine", "", [""]]];
-
-        private _displayName = getText (configFile >> "CfgMagazines" >> _magazine >> "displayName");
-
-        if (_displayName isEqualTo "") exitWith {[]};
-
-        (magazinesDetail _unit select {_x find _displayName == 0}) apply {_x = _x splitString "[:]"; _x select (count _x - 1)};
-    };
-};
-
 ADDON = true;