1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:57:38 +08:00

Merge branch 'master' into counter_bindables

This commit is contained in:
Dan Balasescu 2017-03-10 14:21:33 +09:00 committed by GitHub
commit 0fa2776975
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 1c80609e7aa686f4abdc82bcd6a8f03439463ce7 Subproject commit a50dd75b114da963c75e6a5314099d99140035b8

View File

@ -123,7 +123,7 @@ namespace osu.Game.Graphics.UserInterface
if (value <= i) if (value <= i)
return minStarScale; return minStarScale;
return i + 1 <= value ? 1.0f : Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1); return i + 1 <= value ? 1.0f : (float)Interpolation.ValueAt(value, minStarScale, 1.0f, i, i + 1);
} }
private void transformCount(float newValue) private void transformCount(float newValue)