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 'upstream/master' into collapse-graph-option

Browse Source
This commit is contained in:
Dean Herbert
2020-01-24 13:55:42 +09:00
parent 27e79d56ec 9f8e3c21e0
commit da65fff48e
1449 changed files with 49544 additions and 17465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Screens/Play/SongProgress.cs
View File

@ -13,7 +13,6 @@ using osu.Framework.Bindables;
using osu.Framework.Timing;
using osu.Game.Configuration;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.UI;
namespace osu.Game.Screens.Play
@ -40,6 +39,9 @@ namespace osu.Game.Screens.Play
public readonly Bindable<bool> ShowGraph = new Bindable<bool>();
//TODO: this isn't always correct (consider mania where a non-last object may last for longer than the last in the list).
private double lastHitTime => objects.Last().GetEndTime() + 1;
public override bool HandleNonPositionalInput => AllowSeeking.Value;
public override bool HandlePositionalInput => AllowSeeking.Value;
@ -101,8 +103,7 @@ namespace osu.Game.Screens.Play
[BackgroundDependencyLoader(true)]
private void load(OsuColour colours, GameplayClock clock, OsuConfigManager config)
{
if (clock != null)
gameplayClock = clock;
base.LoadComplete();
config.BindWith(OsuSetting.ShowProgressGraph, ShowGraph);