RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge fail.

This commit is contained in:
Dean Herbert 2017-04-06 16:06:02 +09:00
parent 4783d17d94
commit 1942ef9e8f
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -250,7 +250,7 @@ private void handleTimingPoints(Beatmap beatmap, string val)
{
Time = time,
BeatLength = beatLength,
VelocityAdjustment = beatLength < 0 ? -beatLength / 100.0 : 1,
SpeedMultiplier = beatLength < 0 ? -beatLength / 100.0 : 1,
TimingChange = timingChange,
TimeSignature = timeSignature,
SampleBank = stringSampleSet,