sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into stateful-menu-items

Browse Source
This commit is contained in:
Dean Herbert
2019-11-12 10:31:50 +09:00
committed by GitHub
parent 5bb65d0716 5da4db6889
commit 52ab309295
74 changed files with 860 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/Containers/ShakeContainer.cs
View File

@ -43,9 +43,11 @@ namespace osu.Game.Graphics.Containers
// if we don't have enough time for the second shake, skip it.
if (!maximumLength.HasValue || maximumLength >= ShakeDuration * 4)
{
sequence = sequence
.MoveToX(shake_amount, ShakeDuration, Easing.InOutSine).Then()
.MoveToX(-shake_amount, ShakeDuration, Easing.InOutSine).Then();
}
sequence.MoveToX(0, ShakeDuration / 2, Easing.InSine);
}

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -51,8 +51,10 @@ namespace osu.Game.Graphics.UserInterface
});
if (isEnumType && AddEnumEntriesAutomatically)
{
foreach (var val in (T[])Enum.GetValues(typeof(T)))
AddItem(val);
}
}
[BackgroundDependencyLoader]

3
osu.Game/Graphics/UserInterface/ScoreCounter.cs
View File

@ -43,9 +43,12 @@ namespace osu.Game.Graphics.UserInterface
protected override string FormatCount(double count)
{
string format = new string('0', (int)LeadingZeroes);
if (UseCommaSeparator)
{
for (int i = format.Length - 3; i > 0; i -= 3)
format = format.Insert(i, @",");
}
return ((long)count).ToString(format);
}