Merge remote-tracking branch 'upstream/master' into song-select-filtering

This commit is contained in:
Drew DeVault
2017-01-31 19:00:50 -05:00
13 changed files with 133 additions and 83 deletions

View File

@ -187,7 +187,7 @@ namespace osu.Game.Screens.Select
private static float offsetX(float dist, float halfHeight)
{
// The radius of the circle the carousel moves on.
const float CIRCLE_RADIUS = 4;
const float CIRCLE_RADIUS = 3;
double discriminant = Math.Max(0, CIRCLE_RADIUS * CIRCLE_RADIUS - dist * dist);
float x = (CIRCLE_RADIUS - (float)Math.Sqrt(discriminant)) * halfHeight;