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

Server can inflict impact damage on clients, character oxygen level syncing bugfix, hulls send a networkevent when oxygen level changes by >=5%, limb velocities aren't reset when receiving a network update

Browse Source
This commit is contained in:
Regalis
2016-06-29 17:26:26 +03:00
parent 3e3ec5a2ef
commit 34c6569313
6 changed files with 48 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Physics/PhysicsBody.cs
+25 -25
View File
@@ -27,9 +27,9 @@ namespace Barotrauma
protected float prevRotation;
protected Vector2 targetPosition;
protected Vector2 targetVelocity;
//protected Vector2 targetVelocity;
protected float targetRotation;
protected float targetAngularVelocity;
//protected float targetAngularVelocity;
private Vector2 drawPosition;
private float drawRotation;
@@ -64,16 +64,16 @@ namespace Barotrauma
}
}
public Vector2 TargetVelocity
{
get { return targetVelocity; }
set
{
if (!MathUtils.IsValid(value)) return;
targetVelocity.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
targetVelocity.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
}
}
//public Vector2 TargetVelocity
//{
// get { return targetVelocity; }
// set
// {
// if (!MathUtils.IsValid(value)) return;
// targetVelocity.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
// targetVelocity.Y = MathHelper.Clamp(value.Y, -100.0f, 100.0f);
// }
//}
public float TargetRotation
{
@@ -85,15 +85,15 @@ namespace Barotrauma
}
}
public float TargetAngularVelocity
{
get { return targetAngularVelocity; }
set
{
if (!MathUtils.IsValid(value)) return;
targetAngularVelocity = value;
}
}
//public float TargetAngularVelocity
//{
// get { return targetAngularVelocity; }
// set
// {
// if (!MathUtils.IsValid(value)) return;
// targetAngularVelocity = value;
// }
//}
public Vector2 DrawPosition
{
@@ -314,8 +314,8 @@ namespace Barotrauma
}
body.SetTransform(targetPosition, targetRotation == 0.0f ? body.Rotation : targetRotation);
body.LinearVelocity = targetVelocity;
body.AngularVelocity = targetAngularVelocity;
//body.LinearVelocity = targetVelocity;
//body.AngularVelocity = targetAngularVelocity;
targetPosition = Vector2.Zero;
}
@@ -415,10 +415,10 @@ namespace Barotrauma
return;
targetPosition = newTargetPos;
TargetVelocity = newTargetVel;
LinearVelocity = newTargetVel;
targetRotation = newTargetRotation;
targetAngularVelocity = newTargetAngularVel;
AngularVelocity = newTargetAngularVel;
lastNetworkUpdateTime = sendingTime;
}