mirror of
https://github.com/ppy/osu.git
synced 2024-09-22 11:27:24 +08:00
Merge branch 'master' into beatmap-details-rewrite
This commit is contained in:
commit
adba5b5ba6
@ -1 +1 @@
|
|||||||
Subproject commit a617245a4261d7d6e138c2fddbbeaa7940d24ca7
|
Subproject commit 0fe1e50b38ff9ce8aceba231eede3333cb73bb23
|
@ -51,6 +51,7 @@ namespace osu.Game.Rulesets.Osu.OsuDifficulty.Preprocessing
|
|||||||
|
|
||||||
foreach (OsuDifficultyHitObject h in onScreen)
|
foreach (OsuDifficultyHitObject h in onScreen)
|
||||||
{
|
{
|
||||||
|
// ReSharper disable once PossibleNullReferenceException (resharper not smart enough to understand IEnumerator.MoveNext())
|
||||||
h.TimeUntilHit -= latest.DeltaTime;
|
h.TimeUntilHit -= latest.DeltaTime;
|
||||||
// Calculate reading strain here
|
// Calculate reading strain here
|
||||||
}
|
}
|
||||||
|
@ -302,8 +302,8 @@ namespace osu.Game.Overlays
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
//figure out the best direction based on order in playlist.
|
//figure out the best direction based on order in playlist.
|
||||||
var last = playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo.ID).Count();
|
var last = playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo?.ID).Count();
|
||||||
var next = beatmap == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmap.BeatmapSetInfo.ID).Count();
|
var next = beatmap == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmap.BeatmapSetInfo?.ID).Count();
|
||||||
|
|
||||||
direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
|
direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
|
||||||
}
|
}
|
||||||
|
@ -28,6 +28,8 @@ namespace osu.Game.Screens.Play
|
|||||||
|
|
||||||
public override void Add(KeyCounter key)
|
public override void Add(KeyCounter key)
|
||||||
{
|
{
|
||||||
|
if (key == null) throw new ArgumentNullException(nameof(key));
|
||||||
|
|
||||||
base.Add(key);
|
base.Add(key);
|
||||||
key.IsCounting = IsCounting;
|
key.IsCounting = IsCounting;
|
||||||
key.FadeTime = FadeTime;
|
key.FadeTime = FadeTime;
|
||||||
|
Loading…
Reference in New Issue
Block a user