Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into Input

Browse Source
This commit is contained in:
ShadowCommander
2019-08-04 16:10:06 -07:00
parent 7422d9148a 6c76c5d917
commit ca9cc36a93
11 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Chat/ChatManager.cs
View File

@@ -13,6 +13,7 @@ using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Client.Chat
@@ -90,7 +91,7 @@ namespace Content.Client.Chat
_speechBubbleRoot.SetPositionFirst();
}
public void FrameUpdate(RenderFrameEventArgs delta)
public void FrameUpdate(FrameEventArgs delta)
{
// Update queued speech bubbles.
if (_queuedSpeechBubbles.Count == 0)
@@ -106,7 +107,7 @@ namespace Content.Client.Chat
continue;
}
queueData.TimeLeft -= delta.Elapsed;
queueData.TimeLeft -= delta.DeltaSeconds;
if (queueData.TimeLeft > 0)
{
continue;

7
Content.Client/Chat/SpeechBubble.cs
View File

@@ -6,6 +6,7 @@ using Robust.Client.UserInterface.Controls;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Timers;
using Robust.Shared.Timing;
namespace Content.Client.Chat
{
@@ -73,11 +74,11 @@ namespace Content.Client.Chat
_verticalOffsetAchieved = -ContentHeight;
}
protected override void FrameUpdate(RenderFrameEventArgs args)
protected override void FrameUpdate(FrameEventArgs args)
{
base.FrameUpdate(args);
_timeLeft -= args.Elapsed;
_timeLeft -= args.DeltaSeconds;
if (_timeLeft <= FadeTime)
{
@@ -99,7 +100,7 @@ namespace Content.Client.Chat
}
else
{
_verticalOffsetAchieved = FloatMath.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.Elapsed);
_verticalOffsetAchieved = FloatMath.Lerp(_verticalOffsetAchieved, VerticalOffset, 10 * args.DeltaSeconds);
}
var worldPos = _senderEntity.Transform.WorldPosition;