Merge branch 'master' into remove-dragbar

This commit is contained in:
Jai Sharma
2017-07-06 20:14:08 +01:00
committed by GitHub
75 changed files with 345 additions and 197 deletions

View File

@ -26,10 +26,11 @@ using osu.Framework.Threading;
using osu.Game.Overlays.Music;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public class MusicController : FocusedOverlayContainer
public class MusicController : OsuFocusedOverlayContainer
{
private const float player_height = 130;