tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into 20-06-24-movement-prediction

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-06-24 04:04:43 +02:00
parent da45a52325 78085855db
commit f3a816321c
2259 changed files with 16436 additions and 11772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
View File

@@ -77,7 +77,7 @@ namespace Content.Shared.GameObjects.Components.Movement
public float CurrentPushSpeed => 5;
public float GrabRange => 0.2f;
public bool Sprinting => !_heldMoveButtons.HasFlag(MoveButtons.Sprint);
public bool Sprinting => !_heldMoveButtons.HasFlag(MoveButtons.Walk);
/// <summary>
/// Calculated linear velocity direction of the entity.
@@ -207,11 +207,11 @@ namespace Content.Shared.GameObjects.Components.Movement
Dirty();
}
public void SetSprinting(ushort subTick, bool enabled)
public void SetSprinting(ushort subTick, bool walking)
{
// Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}");
SetMoveInput(subTick, enabled, MoveButtons.Sprint);
SetMoveInput(subTick, walking, MoveButtons.Walk);
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
@@ -281,7 +281,7 @@ namespace Content.Shared.GameObjects.Components.Movement
Down = 2,
Left = 4,
Right = 8,
Sprint = 16,
Walk = 16,
}
}
}