Merge branch 'release' into revc65656a0

addons/common/XEH_postInit.sqf

@@ -444,6 +444,11 @@ if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
 // Add various canInteractWith conditions
 //////////////////////////////////////////////////
 
+["isNotDead", {
+    params ["_unit", "_target"];
+    alive _unit
+}] call FUNC(addCanInteractWithCondition);
+
 ["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);
 
 ["isNotInside", {

addons/interact_menu/XEH_preInit.sqf

@@ -45,6 +45,13 @@ GVAR(expanded) = false;
 
 GVAR(startHoverTime) = ACE_diagTime;
 GVAR(expandedTime) = ACE_diagTime;
+
+// reset on mission load
+addMissionEventHandler ["Loaded", {
+    GVAR(startHoverTime) = 0;
+    GVAR(expandedTime) = 0;
+}];
+
 GVAR(iconCtrls) = [];
 GVAR(iconCount) = 0;
 

addons/main/config.cpp

@@ -594,7 +594,7 @@ class CfgSettings {
         class Versioning {
             class ACE {
                 class dependencies {
-                    CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "true"};
+                    CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};
                 };
             };
         };

addons/medical/ACE_Medical_Treatments.hpp

@@ -1366,7 +1366,7 @@ class ACE_Medical_Advanced {
                 timeInSystem = 900;
                 maxDose = 4;
                 inCompatableMedication[] = {};
-                viscosityChange = 10;
+                viscosityChange = -10;
             };
             class Epinephrine {
                 painReduce = 0;