Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3

acemod · Apr 12, 2015 · 7b0e7a1 · 7b0e7a1
2 parents f16d539 + dcf782a
commit 7b0e7a1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/addons/dragging/functions/fnc_dropObject.sqf b/addons/dragging/functions/fnc_dropObject.sqf
@@ -23,8 +23,10 @@ _unit removeAction (_unit getVariable [QGVAR(ReleaseActionID), -1]);
 private "_inBuilding";
 _inBuilding = [_unit] call FUNC(isObjectOnObject);
 
-// play release animation
-_unit playAction "released";
+if !(_unit getvariable ["ACE_isUnconscious", false]) then {
+	// play release animation
+	_unit playAction "released";
+};
 
 // prevent collision damage
 ["fixCollision", _unit] call EFUNC(common,localEvent);
@@ -58,3 +60,7 @@ if !(_target isKindOf "CAManBase") then {
     ["fixPosition", _target, _target] call EFUNC(common,targetEvent);
     ["fixFloating", _target, _target] call EFUNC(common,targetEvent);
 };
+
+if (_unit getvariable ["ACE_isUnconscious", false]) then {
+    [_unit, "unconscious", 2, true] call EFUNC(common,doAnimation);
+};
diff --git a/addons/dragging/functions/fnc_dropObject_carry.sqf b/addons/dragging/functions/fnc_dropObject_carry.sqf
@@ -32,7 +32,7 @@ detach _target;
 
 // fix anim when aborting carrying persons
 if (_target isKindOf "CAManBase" || {animationState _unit in CARRY_ANIMATIONS}) then {
-    if (vehicle _unit == _unit) then {
+    if (vehicle _unit == _unit && {!(_unit getvariable ["ACE_isUnconscious", false])}) then {
         [_unit, "", 2, true] call EFUNC(common,doAnimation);
     };
 

diff --git a/documentation/development/arma-3-issues.md b/documentation/development/arma-3-issues.md
@@ -18,6 +18,7 @@ Keeping track of Arma 3 issues that need to be fixed. If you want to support us
 * [commy2: 0021443: Unexpected behavior of += array in configs](http://feedback.arma3.com/view.php?id=21443)
 * [commy2: 0022671: setVariable is not always JIP persistent](http://feedback.arma3.com/view.php?id=22671)
 * [CorruptedHeart: 0022318: Can no longer use "MenuBack" shortcut in AddAction](http://feedback.arma3.com/view.php?id=22318)
+* [James2464: 0023725: All Environment Rocks Should Have PhysX LODs](http://feedback.arma3.com/view.php?id=23725)
 
 **Resolved:**