h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 05:22:54 +08:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into database-tidy

Browse Source
This commit is contained in:
Dean Herbert 2017-07-27 17:40:25 +09:00
commit 6f4efbeda6
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.Game/IO/FileStore.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.IO
public FileInfo Add(Stream data, string filename = null) public FileInfo Add(Stream data, string filename = null)
{ {
string hash = data.GetSHA2Hash(); string hash = data.ComputeSHA2Hash();
var info = new FileInfo var info = new FileInfo
{ {

7
osu.Game/Overlays/Chat/ChatLine.cs
View File

@ -13,6 +13,7 @@ using osu.Framework.Graphics.Effects;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Users; using osu.Game.Users;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Chat namespace osu.Game.Overlays.Chat
{ {
@ -164,10 +165,12 @@ namespace osu.Game.Overlays.Chat
Padding = new MarginPadding { Left = message_padding + padding }, Padding = new MarginPadding { Left = message_padding + padding },
Children = new Drawable[] Children = new Drawable[]
{ {
new OsuSpriteText new OsuTextFlowContainer(t =>
{
t.TextSize = text_size;
})
{ {
Text = Message.Content, Text = Message.Content,
TextSize = text_size,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
} }

2
osu.Game/Screens/Select/BeatmapDetails.cs
View File

@ -86,7 +86,7 @@ namespace osu.Game.Screens.Select
requestedBeatmap.Metrics = res; requestedBeatmap.Metrics = res;
Schedule(() => updateMetrics(res)); Schedule(() => updateMetrics(res));
}; };
lookup.Failure += e => updateMetrics(null); lookup.Failure += e => Schedule(() => updateMetrics(null));
api.Queue(lookup); api.Queue(lookup);
loading.Show(); loading.Show();