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

Update in line with framework changes

Browse Source
This commit is contained in:
Dean Herbert
2018-02-28 21:50:52 +09:00
Unverified
parent cff17f1864
commit 01fcf9c813
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Rulesets/UI/RulesetInputManager.cs
+1 -1
View File
@@ -101,7 +101,7 @@ namespace osu.Game.Rulesets.UI
//our clock will now be our parent's clock, but we want to replace this to allow manual control.
parentClock = Clock;
ShouldProcessClock = false;
ProcessCustomClock = false;
Clock = new FramedClock(clock = new ManualClock
{
CurrentTime = parentClock.CurrentTime,
osu.Game/Screens/Play/PauseContainer.cs
+1 -1
View File
@@ -57,7 +57,7 @@ namespace osu.Game.Screens.Play
AddInternal(content = new Container
{
Clock = this.framedClock,
ShouldProcessClock = false,
ProcessCustomClock = false,
RelativeSizeAxes = Axes.Both
});
osu.Game/Screens/Play/Player.cs
+2 -2
View File
@@ -183,7 +183,7 @@ namespace osu.Game.Screens.Play
{
RelativeSizeAxes = Axes.Both,
Clock = offsetClock,
ShouldProcessClock = false,
ProcessCustomClock = false,
Children = new[]
{
storyboardContainer = new Container
@@ -209,7 +209,7 @@ namespace osu.Game.Screens.Play
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Clock = offsetClock,
ShouldProcessClock = false,
ProcessCustomClock = false,
Breaks = beatmap.Breaks
}
}
osu.Game/Screens/Play/SkipButton.cs
+1 -1
View File
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
if (FramedClock != null)
{
Clock = FramedClock;
ShouldProcessClock = false;
ProcessCustomClock = false;
}
Children = new Drawable[]