Merge branch 'master' into increase-ci-strictness

This commit is contained in:
Thomas Müller
2017-03-06 21:44:39 +01:00
committed by GitHub
18 changed files with 137 additions and 49 deletions

View File

@ -31,8 +31,6 @@ namespace osu.Game
{
public class OsuGame : OsuGameBase
{
public virtual bool IsDeployedBuild => false;
public Toolbar Toolbar;
private ChatOverlay chat;
@ -193,7 +191,7 @@ namespace osu.Game
private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
{
if (args.Repeat) return false;
if (args.Repeat || intro == null) return false;
switch (args.Key)
{