h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-08 07:43:42 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-multiple-tracks-playing

Browse Source
This commit is contained in:
Dean Herbert
2018-02-28 15:32:16 +09:00
committed by GitHub
Unverified
parent 510ecd7c87 59538cd664
commit 08497427fd
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu-framework
+1 -1
Submodule osu-framework updated: 9a773e62eb...500a791577
osu.Game/Graphics/Containers/ParallaxContainer.cs
+4 -2
View File
@@ -8,6 +8,7 @@ using OpenTK;
using osu.Framework.Allocation;
using osu.Game.Configuration;
using osu.Framework.Configuration;
using osu.Framework.MathUtils;
namespace osu.Game.Graphics.Containers
{
@@ -61,8 +62,9 @@ namespace osu.Game.Graphics.Containers
if (parallaxEnabled)
{
Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2;
content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, Easing.OutQuint);
Vector2 offset = (input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount;
content.Position = Interpolation.ValueAt(Clock.ElapsedFrameTime, content.Position, offset, 0, 1000, Easing.OutQuint);
content.Scale = new Vector2(1 + ParallaxAmount);
}
osu.Game/Screens/Play/SongProgressBar.cs
+1 -1
View File
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Play
{
var xFill = value * UsableWidth;
fill.Width = xFill;
handleBase.MoveToX(xFill);
handleBase.X = xFill;
}
protected override void OnUserChange() => OnSeek?.Invoke(Current);
osu.Game/Screens/Select/BeatmapCarousel.cs
+7 -1
View File
@@ -407,12 +407,14 @@ namespace osu.Game.Screens.Select
continue;
}
float depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
// Only add if we're not already part of the content.
if (!scrollableContent.Contains(item))
{
// Makes sure headers are always _below_ items,
// and depth flows downward.
item.Depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
item.Depth = depth;
switch (item.LoadState)
{
@@ -426,6 +428,10 @@ namespace osu.Game.Screens.Select
break;
}
}
else
{
scrollableContent.ChangeChildDepth(item, depth);
}
}
// this is not actually useful right now, but once we have groups may well be.