Merge branch 'master' into drawable-room-update

This commit is contained in:
Seth
2017-07-11 20:42:44 -03:00
committed by GitHub
146 changed files with 954 additions and 771 deletions

View File

@ -14,13 +14,14 @@ using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
namespace osu.Game.Screens.Multiplayer
{
public class DrawableRoom : ClickableContainer
public class DrawableRoom : OsuClickableContainer
{
private const float transition_duration = 100;
private const float content_padding = 10;