sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
Conflicts:
	osu-framework
	osu.Desktop.VisualTests/Program.cs
This commit is contained in:
Dean Herbert
2016-10-12 15:20:23 +09:00
parent 05031d18ef 5306141f5f
commit 79b62d4373
14 changed files with 1124 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/OsuGame.cs
View File

@ -54,7 +54,7 @@ namespace osu.Game
OnHome = delegate { MainMenu?.MakeCurrent(); },
OnSettings = delegate { Options.PoppedOut = !Options.PoppedOut; },
OnPlayModeChange = delegate (PlayMode m) { PlayMode.Value = m; },
Alpha = 0.001f //fixes invalidation fuckup
Alpha = 0.001f,
},
Chat = new ChatConsole(),
new VolumeControl