h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 10:43:04 +08:00
Code Issues Releases Wiki Activity

Update framework

Browse Source
This commit is contained in:
Dean Herbert 2017-05-11 21:12:13 +09:00
parent b258109a9e
commit 9a1c662d1f
4 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit a1a62c14a51654c933c5b077c725d566f167145b Subproject commit 682f078b2efc82fa19342f499f14c4a8458843d5

26
osu.Game/Input/GlobalHotkeys.cs
View File

@ -1,26 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Graphics;
using osu.Framework.Input;
namespace osu.Game.Input
{
public class GlobalHotkeys : Drawable
{
public Func<InputState, KeyDownEventArgs, bool> Handler;
public override bool HandleInput => true;
public GlobalHotkeys()
{
RelativeSizeAxes = Axes.Both;
}
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
{
return Handler(state, args);
}
}
}

1
osu.Game/OsuGame.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Input;
using OpenTK.Input; using OpenTK.Input;
using osu.Framework.Logging; using osu.Framework.Logging;
using osu.Game.Graphics.UserInterface.Volume; using osu.Game.Graphics.UserInterface.Volume;

1
osu.Game/osu.Game.csproj
View File

@ -284,7 +284,6 @@
<Compile Include="Screens\Play\HUD\ComboResultCounter.cs" /> <Compile Include="Screens\Play\HUD\ComboResultCounter.cs" />
<Compile Include="Graphics\UserInterface\RollingCounter.cs" /> <Compile Include="Graphics\UserInterface\RollingCounter.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" /> <Compile Include="Graphics\UserInterface\Volume\VolumeControlReceptor.cs" />
<Compile Include="Input\GlobalHotkeys.cs" />
<Compile Include="Graphics\Backgrounds\Background.cs" /> <Compile Include="Graphics\Backgrounds\Background.cs" />
<Compile Include="Graphics\Containers\ParallaxContainer.cs" /> <Compile Include="Graphics\Containers\ParallaxContainer.cs" />
<Compile Include="Graphics\Cursor\MenuCursor.cs" /> <Compile Include="Graphics\Cursor\MenuCursor.cs" />