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

- multiple submarines can be "merged" into one file (to be used as escape vessels etc)

Browse Source 
- WIP docking ports
This commit is contained in:
Regalis
2016-06-26 14:31:00 +03:00
parent 296c5a14ed
commit b04e204dc3
19 changed files with 740 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Subsurface/Source/Characters/Animation/Ragdoll.cs
View File

@@ -616,20 +616,7 @@ namespace Barotrauma
while (ce != null && ce.Contact != null)
{
ce.Contact.Enabled = false;
//if (ce.Contact.IsTouching && ce.Contact.Enabled &&
// ((inToOut && ce.Contact.FixtureA.Body.UserData is Structure) || (!inToOut && ce.Contact.FixtureA.Body.UserData is Submarine)))
//{
// Vector2 normal;
// FarseerPhysics.Common.FixedArray2<Vector2> worldPoints;
// ce.Contact.GetWorldManifold(out normal, out worldPoints);
// foreach (Limb limb2 in Limbs)
// {
// limb2.body.FarseerBody.ApplyLinearImpulse(limb2.Mass * normal);
// }
// return false;
//}
ce = ce.Next;
}
}
@@ -639,7 +626,7 @@ namespace Barotrauma
limb.body.LinearVelocity += velocityChange;
}
character.Stun = 0.1f;
//character.Stun = 0.1f;
character.DisableImpactDamageTimer = 0.25f;
SetPosition(refLimb.SimPosition + moveAmount);