1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 22:22:54 +08:00

Merge remote-tracking branch 'upstream/master' into difficulty-calculator

This commit is contained in:
Dean Herbert 2017-02-20 21:20:56 +09:00
commit aedce4d516
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
2 changed files with 6 additions and 1 deletions

@ -1 +1 @@
Subproject commit f370d4d6ef9f975932324d30272dfffc929a6622
Subproject commit b3f409ffb027f1b16c639c7ce3bb9dc4f215f79b

View File

@ -13,6 +13,11 @@ namespace osu.Game.Input
public override bool HandleInput => true;
public GlobalHotkeys()
{
RelativeSizeAxes = Axes.Both;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
return Handler(state, args);