sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into drawable-room-update

Browse Source
This commit is contained in:
Seth
2017-07-11 20:42:44 -03:00
committed by GitHub
parent 24283b9500 39d20565aa
commit b30721edbe
146 changed files with 954 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Multiplayer/DrawableRoom.cs
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;

1
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -335,6 +335,7 @@ namespace osu.Game.Screens.Multiplayer
{
new AsyncLoadWrapper(new BeatmapBackgroundSprite(new OnlineWorkingBeatmap(value, textures, null))
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
FillMode = FillMode.Fill,