vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

Browse Source
This commit is contained in:
Regalis
2016-11-18 18:48:10 +02:00
parent 8c90fd1774 a4ebb116c0
commit 6ca605aa57
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
+1
View File
@@ -61,6 +61,7 @@ namespace Barotrauma
if (character.IsDead || character.IsUnconscious || stunTimer > 0.0f) if (character.IsDead || character.IsUnconscious || stunTimer > 0.0f)
{ {
levitatingCollider = false;
Collider.FarseerBody.FixedRotation = false; Collider.FarseerBody.FixedRotation = false;
/*if (character.IsRemotePlayer) /*if (character.IsRemotePlayer)
Subsurface/Source/Characters/Animation/Ragdoll.cs
+1 -1
View File
@@ -984,7 +984,7 @@ namespace Barotrauma
rayEnd.Y -= Collider.height * 0.5f + Collider.radius + colliderHeightFromFloor*1.2f; rayEnd.Y -= Collider.height * 0.5f + Collider.radius + colliderHeightFromFloor*1.2f;
Vector2 colliderBottomDisplay = ConvertUnits.ToDisplayUnits(GetColliderBottom()); Vector2 colliderBottomDisplay = ConvertUnits.ToDisplayUnits(GetColliderBottom());
if (!inWater && levitatingCollider) if (!inWater && !character.IsDead && !character.IsUnconscious && levitatingCollider && Collider.LinearVelocity.Y>-ImpactTolerance)
{ {
float closestFraction = 1.0f; float closestFraction = 1.0f;
Fixture closestFixture = null; Fixture closestFixture = null;