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

Merge branch 'master' into multiplayer-room-inspector

Browse Source
This commit is contained in:
Dean Herbert
2017-06-23 21:39:21 +09:00
parent e708cdf41a e91348ff85
commit 81de1bd5a7
283 changed files with 5552 additions and 2404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Multiplayer/DrawableGameType.cs
View File

@ -4,7 +4,8 @@
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Online.Multiplayer;

6
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -7,7 +7,7 @@ using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Database;
using osu.Game.Graphics;
@ -47,7 +47,7 @@ namespace osu.Game.Screens.Multiplayer
Height = height;
CornerRadius = 5;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),
@ -68,7 +68,7 @@ namespace osu.Game.Screens.Multiplayer
},
avatar = new UpdateableAvatar
{
Size = new Vector2(Height - content_padding* 2),
Size = new Vector2(Height - content_padding * 2),
Masking = true,
CornerRadius = 5f,
Margin = new MarginPadding { Left = content_padding * 2, Top = content_padding },

4
osu.Game/Screens/Multiplayer/Match.cs
View File

@ -24,12 +24,12 @@ namespace osu.Game.Screens.Multiplayer
{
base.OnEntering(last);
Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
Background.FadeColour(Color4.DarkGray, 500);
}
protected override bool OnExiting(Screen next)
{
Background.Schedule(() => Background.FadeColour(Color4.White, 500));
Background.FadeColour(Color4.White, 500);
return base.OnExiting(next);
}
}

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

@ -10,7 +10,8 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Textures;
using osu.Framework.Localisation;
using osu.Game.Beatmaps.Drawables;