sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into remove-usings

Browse Source
This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
parent a5dfa7ab06 a8135332d6
commit c5552dfb27
25 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/BackButton.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Graphics.UserInterface
private void load(AudioManager audio, OsuColour colours)
{
ActivationSound = audio.Sample.Get(@"Menu/menuback");
Colour = colours.Pink;
BackgroundColour = colours.Pink;
HoverColour = colours.PinkDark;
}
}

2
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Graphics.UserInterface
private Container c1;
private Container c2;
public Color4 Colour
public Color4 BackgroundColour
{
set
{