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

Merge branch 'refs/heads/master' into dependency-injection

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
This commit is contained in:
Dean Herbert
2016-11-12 19:44:16 +09:00
parent 0d4560a054 646fe5c5f4
commit cc0f61f545
82 changed files with 688 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Online/Chat/Display/ChannelDisplay.cs
View File

@ -60,8 +60,8 @@ namespace osu.Game.Online.Chat.Display
channel.NewMessagesArrived -= newMessages;
}
[Initializer]
private void Load()
[BackgroundDependencyLoader]
private void load()
{
newMessages(channel.Messages);
}

4
osu.Game/Online/Chat/Display/ChatLine.cs
View File

@ -28,8 +28,8 @@ namespace osu.Game.Online.Chat.Display
const float padding = 200;
const float text_size = 20;
[Initializer]
private void Load()
[BackgroundDependencyLoader]
private void load()
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;