sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +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/Graphics/UserInterface/KeyCounter.cs
View File

@ -61,8 +61,8 @@ namespace osu.Game.Graphics.UserInterface
Name = name;
}
[Initializer]
private void Load(TextureStore textures)
[BackgroundDependencyLoader]
private void load(TextureStore textures)
{
Children = new Drawable[]
{

4
osu.Game/Graphics/UserInterface/RollingCounter.cs
View File

@ -120,8 +120,8 @@ namespace osu.Game.Graphics.UserInterface
AutoSizeAxes = Axes.Both;
}
[Initializer]
private void Load()
[BackgroundDependencyLoader]
private void load()
{
DisplayedCount = Count;

4
osu.Game/Graphics/UserInterface/StarCounter.cs
View File

@ -110,8 +110,8 @@ namespace osu.Game.Graphics.UserInterface
};
}
[Initializer]
private void Load()
[BackgroundDependencyLoader]
private void load()
{
starContainer.Width = MaxStars * StarSize + Math.Max(MaxStars - 1, 0) * StarSpacing;
starContainer.Height = StarSize;

4
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -33,8 +33,8 @@ namespace osu.Game.Graphics.UserInterface.Volume
Origin = Anchor.BottomRight;
}
[Initializer]
private void Load()
[BackgroundDependencyLoader]
private void load()
{
VolumeGlobal.ValueChanged += volumeChanged;
VolumeSample.ValueChanged += volumeChanged;