h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:07:25 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into taiko-fixes

Browse Source
This commit is contained in:
Dan Balasescu 2017-04-20 18:02:30 +09:00 committed by GitHub
commit 37ef91e0f3
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -12,10 +12,11 @@ using osu.Framework.Input;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
{ {
public class OsuSliderBar<U> : SliderBar<U> where U : struct public class OsuSliderBar<T> : SliderBar<T> where T : struct
{ {
private SampleChannel sample; private SampleChannel sample;
private double lastSampleTime; private double lastSampleTime;
private T lastSampleValue;
private readonly Nub nub; private readonly Nub nub;
private readonly Box leftBox; private readonly Box leftBox;
@ -84,6 +85,12 @@ namespace osu.Game.Graphics.UserInterface
{ {
if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50) if (Clock == null || Clock.CurrentTime - lastSampleTime <= 50)
return; return;
if (Current.Value.Equals(lastSampleValue))
return;
lastSampleValue = Current.Value;
lastSampleTime = Clock.CurrentTime; lastSampleTime = Clock.CurrentTime;
sample.Frequency.Value = 1 + NormalizedValue * 0.2f; sample.Frequency.Value = 1 + NormalizedValue * 0.2f;

2
osu.Game/Online/Chat/Drawables/ChatLine.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Online.Chat.Drawables
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Font = @"Exo2.0-SemiBold", Font = @"Exo2.0-SemiBold",
Text = $@"{Message.Timestamp.LocalDateTime:hh:mm:ss}", Text = $@"{Message.Timestamp.LocalDateTime:HH:mm:ss}",
FixedWidth = true, FixedWidth = true,
TextSize = text_size * 0.75f, TextSize = text_size * 0.75f,
Alpha = 0.4f, Alpha = 0.4f,