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

Merge branch 'master' into limit-game-access

Browse Source 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs
	osu.Game/GameModes/Menu/ButtonSystem.cs
	osu.Game/Online/Chat/Display/ChatLine.cs
	osu.Game/OsuGame.cs
	osu.Game/Overlays/ToolbarButton.cs
This commit is contained in:
Dean Herbert
2016-10-12 20:05:46 +09:00
parent 29d223dc41 fd55199114
commit aa96d98822
20 changed files with 908 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/GameModes/Menu/OsuLogo.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.GameModes.Menu
{
private Sprite logo;
private Container logoBounceContainer;
private ButtonSystem.MenuVisualisation vis;
private MenuVisualisation vis;
public Action Action;
@ -70,7 +70,7 @@ namespace osu.Game.GameModes.Menu
}
}
},
vis = new ButtonSystem.MenuVisualisation
vis = new MenuVisualisation
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,