h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-key-counter

Browse Source
This commit is contained in:
Dan Balasescu 2019-01-23 17:49:21 +09:00 committed by GitHub
commit 067f290e6e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
View File

@ -101,8 +101,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
float approxFollowCircleRadius = (float)(slider.Radius * 3);
var computeVertex = new Action<double>(t =>
{
double progress = ((int)t - (int)slider.StartTime) / (float)(int)slider.SpanDuration;
if (progress % 2 > 1)
double progress = (t - slider.StartTime) / slider.SpanDuration;
if (progress % 2 >= 1)
progress = 1 - progress % 1;
else
progress = progress % 1;

2
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -198,7 +198,7 @@ namespace osu.Game.Rulesets.Osu.Objects
if (tickDistance == 0) return;
var minDistanceFromEnd = Velocity * 0.01;
var minDistanceFromEnd = Velocity * 10;
var spanCount = this.SpanCount();

2
osu.Game/Overlays/Settings/SettingsDropdown.cs
View File

@ -26,6 +26,8 @@ namespace osu.Game.Overlays.Settings
}
}
public override IEnumerable<string> FilterTerms => base.FilterTerms.Concat(Control.Items.Select(i => i.ToString()));
protected sealed override Drawable CreateControl() => CreateDropdown();
protected virtual OsuDropdown<T> CreateDropdown() => new DropdownControl { Items = Items };

2
osu.Game/Overlays/Settings/SettingsItem.cs
View File

@ -72,7 +72,7 @@ namespace osu.Game.Overlays.Settings
}
}
public IEnumerable<string> FilterTerms => new[] { LabelText };
public virtual IEnumerable<string> FilterTerms => new[] { LabelText };
public bool MatchingFilter
{