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 convert-ranking-statistics

Browse Source
This commit is contained in:
Dean Herbert
2019-03-29 12:42:49 +09:00
committed by GitHub
parent 012dcc25c9 47665f7a81
commit a71e9fdb0e
219 changed files with 965 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -258,8 +258,8 @@ namespace osu.Game.Online.Leaderboards
protected virtual IEnumerable<LeaderboardScoreStatistic> GetStatistics(ScoreInfo model) => new[]
{
new LeaderboardScoreStatistic(FontAwesome.fa_link, "Max Combo", model.MaxCombo.ToString()),
new LeaderboardScoreStatistic(FontAwesome.fa_crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy))
new LeaderboardScoreStatistic(FontAwesome.Link, "Max Combo", model.MaxCombo.ToString()),
new LeaderboardScoreStatistic(FontAwesome.Crosshairs, "Accuracy", string.Format(model.Accuracy % 1 == 0 ? @"{0:P0}" : @"{0:P2}", model.Accuracy))
};
protected override bool OnHover(HoverEvent e)
@ -353,7 +353,7 @@ namespace osu.Game.Online.Leaderboards
Size = new Vector2(icon_size),
Rotation = 45,
Colour = OsuColour.FromHex(@"3087ac"),
Icon = FontAwesome.fa_square,
Icon = FontAwesome.Square,
Shadow = true,
},
new SpriteIcon
@ -378,11 +378,11 @@ namespace osu.Game.Online.Leaderboards
public class LeaderboardScoreStatistic
{
public FontAwesome Icon;
public IconUsage Icon;
public string Value;
public string Name;
public LeaderboardScoreStatistic(FontAwesome icon, string name, string value)
public LeaderboardScoreStatistic(IconUsage icon, string name, string value)
{
Icon = icon;
Name = name;

4
osu.Game/Online/Leaderboards/MessagePlaceholder.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Game.Graphics;
using osu.Framework.Graphics.Sprites;
namespace osu.Game.Online.Leaderboards
{
@ -12,7 +12,7 @@ namespace osu.Game.Online.Leaderboards
public MessagePlaceholder(string message)
{
AddIcon(FontAwesome.fa_exclamation_circle, cp =>
AddIcon(FontAwesome.ExclamationCircle, cp =>
{
cp.Font = cp.Font.With(size: TEXT_SIZE);
cp.Padding = new MarginPadding { Right = 10 };

4
osu.Game/Online/Leaderboards/RetrievalFailurePlaceholder.cs
View File

@ -3,8 +3,8 @@
using System;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osuTK;
@ -41,7 +41,7 @@ namespace osu.Game.Online.Leaderboards
Action = () => Action?.Invoke(),
Child = icon = new SpriteIcon
{
Icon = FontAwesome.fa_refresh,
Icon = FontAwesome.Refresh,
Size = new Vector2(TEXT_SIZE),
Shadow = true,
},

3
osu.Game/Online/Multiplayer/GameTypes/GameTypeTag.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osuTK;
@ -17,7 +18,7 @@ namespace osu.Game.Online.Multiplayer.GameTypes
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_refresh,
Icon = FontAwesome.Refresh,
Size = new Vector2(size),
Colour = colours.Blue,
Shadow = false,

5
osu.Game/Online/Multiplayer/GameTypes/GameTypeTagTeam.cs
View File

@ -3,6 +3,7 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osuTK;
@ -25,14 +26,14 @@ namespace osu.Game.Online.Multiplayer.GameTypes
{
new SpriteIcon
{
Icon = FontAwesome.fa_refresh,
Icon = FontAwesome.Refresh,
Size = new Vector2(size * 0.75f),
Colour = colours.Blue,
Shadow = false,
},
new SpriteIcon
{
Icon = FontAwesome.fa_refresh,
Icon = FontAwesome.Refresh,
Size = new Vector2(size * 0.75f),
Colour = colours.Pink,
Shadow = false,

3
osu.Game/Online/Multiplayer/GameTypes/GameTypeTimeshift.cs
View File

@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
using osuTK;
@ -15,7 +16,7 @@ namespace osu.Game.Online.Multiplayer.GameTypes
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Icon = FontAwesome.fa_clock_o,
Icon = FontAwesome.ClockOutline,
Size = new Vector2(size),
Colour = colours.Blue,
Shadow = false