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

Merge https://github.com/ppy/osu into medal-splash

Browse Source
This commit is contained in:
DrabWeb
2017-06-23 22:42:36 -03:00
parent 15cd4f77b2 7e5b920c92
commit e09625e49d
281 changed files with 6201 additions and 2320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Users/User.cs
View File

@ -22,6 +22,10 @@ namespace osu.Game.Users
public Bindable<UserStatus> Status = new Bindable<UserStatus>();
public int GlobalRank;
public int CountryRank;
//public Team Team;
[JsonProperty(@"profile_colour")]

5
osu.Game/Users/UserPanel.cs
View File

@ -8,6 +8,7 @@ using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
@ -34,7 +35,7 @@ namespace osu.Game.Users
Height = height - status_height;
Masking = true;
CornerRadius = 5;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),
@ -68,7 +69,7 @@ namespace osu.Game.Users
User = user,
Masking = true,
CornerRadius = 5,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),

2
osu.Game/Users/UserStatus.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Users
public override string Message => @"Solo Game";
}
public class UserStatusMultiplayerGame: UserStatusBusy
public class UserStatusMultiplayerGame : UserStatusBusy
{
public override string Message => @"Multiplaying";
}