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

Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel

Browse Source
This commit is contained in:
EVAST9919
2017-07-23 13:27:03 +03:00
parent 388fcfb295 65c26f9b24
commit d9e9ab22db
153 changed files with 797 additions and 1060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -342,7 +342,7 @@ namespace osu.Game.Screens.Select
if (group.State == BeatmapGroupState.Expanded)
{
group.Header.MoveToX(-100, 500, EasingTypes.OutExpo);
group.Header.MoveToX(-100, 500, Easing.OutExpo);
var headerY = group.Header.Position.Y;
foreach (BeatmapPanel panel in group.BeatmapPanels)
@ -350,7 +350,7 @@ namespace osu.Game.Screens.Select
if (panel == selectedPanel)
selectedY = currentY + panel.DrawHeight / 2 - DrawHeight / 2;
panel.MoveToX(-50, 500, EasingTypes.OutExpo);
panel.MoveToX(-50, 500, Easing.OutExpo);
//on first display we want to begin hidden under our group's header.
if (panel.Alpha == 0)
@ -361,11 +361,11 @@ namespace osu.Game.Screens.Select
}
else
{
group.Header.MoveToX(0, 500, EasingTypes.OutExpo);
group.Header.MoveToX(0, 500, Easing.OutExpo);
foreach (BeatmapPanel panel in group.BeatmapPanels)
{
panel.MoveToX(0, 500, EasingTypes.OutExpo);
panel.MoveToX(0, 500, Easing.OutExpo);
movePanel(panel, false, animated, ref currentY);
}
}
@ -380,7 +380,7 @@ namespace osu.Game.Screens.Select
private void movePanel(Panel panel, bool advance, bool animated, ref float currentY)
{
yPositions.Add(currentY);
panel.MoveToY(currentY, animated ? 750 : 0, EasingTypes.OutExpo);
panel.MoveToY(currentY, animated ? 750 : 0, Easing.OutExpo);
if (advance)
currentY += panel.DrawHeight + 5;