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

Merge remote-tracking branch 'origin/master' into migrate-osu-game

Browse Source
This commit is contained in:
smoogipoo 2017-10-31 17:31:25 +09:00 committed by Dean Herbert
commit 687a850216
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit b57d461c6ce963f0b614005d816ce8780dfd6bc2 Subproject commit ef10edfc750b39258edbff46019f1d10700548c2

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

@ -40,11 +40,11 @@ namespace osu.Game.Users
{ {
displayedAvatar?.FadeOut(300); displayedAvatar?.FadeOut(300);
displayedAvatar?.Expire(); displayedAvatar?.Expire();
Add(displayedAvatar = new AsyncLoadWrapper(new Avatar(user) Add(displayedAvatar = new DelayedLoadWrapper(new Avatar(user)
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(200), OnLoadComplete = d => d.FadeInFromZero(200),
})); }));
} }
} }
} }