h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 08:22:56 +08:00
Code Issues Releases Wiki Activity

Merge branch 'results-screen' into score-statistics

Browse Source
This commit is contained in:
Dean Herbert 2017-04-19 20:51:23 +09:00
commit 015eacb3b8
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-resources

@ -1 +1 @@
Subproject commit ce76f812d3e059233e1dea395b125352f638b2da Subproject commit b90c4ed490f76f2995662b3a8af3a32b8756a012

1
osu.Game/OsuGameBase.cs
View File

@ -116,6 +116,7 @@ namespace osu.Game
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Exo2.0-BlackItalic"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera")); Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera"));
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light"));
OszArchiveReader.Register(); OszArchiveReader.Register();

8
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -95,8 +95,8 @@ namespace osu.Game.Screens.Ranking
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
Colour = colours.PinkDarker, Colour = colours.PinkDarker,
Y = 5, Y = 10,
TextSize = 60, TextSize = 56,
}, },
} }
}, },
@ -370,7 +370,8 @@ namespace osu.Game.Screens.Ranking
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(TextureStore textures) private void load(TextureStore textures)
{ {
cover.Texture = textures.Get(user.CoverUrl); if (user.Cover?.Url != null)
cover.Texture = textures.Get(user.Cover?.Url);
} }
} }
@ -383,6 +384,7 @@ namespace osu.Game.Screens.Ranking
public SlowScoreCounter(uint leading = 0) : base(leading) public SlowScoreCounter(uint leading = 0) : base(leading)
{ {
DisplayedCountSpriteText.Shadow = false; DisplayedCountSpriteText.Shadow = false;
DisplayedCountSpriteText.Font = @"Venera-Light";
UseCommaSeparator = true; UseCommaSeparator = true;
} }
} }