h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 12:45:09 +08:00
Code Issues Releases Wiki Activity

Update framework

Browse Source
This commit is contained in:
Dean Herbert 2017-08-12 22:10:57 +09:00
parent 99458aab48
commit b6fb68c6e2
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 67d89a36016f98c0ede576b859a2ccafe114fce8 Subproject commit 2a56eb0619adf654ed4927af1a4b227596c87494

7
osu.Game/Input/Bindings/DatabasedKeyBinding.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using SQLite.Net.Attributes; using SQLite.Net.Attributes;
@ -17,8 +20,8 @@ namespace osu.Game.Input.Bindings
[Column("Keys")] [Column("Keys")]
public string KeysString public string KeysString
{ {
get { return Keys.ToString(); } get { return KeyCombination.ToString(); }
private set { Keys = value; } private set { KeyCombination = value; }
} }
[Column("Action")] [Column("Action")]

5
osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
View File

@ -1,3 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Input.Bindings; using osu.Framework.Input.Bindings;
using osu.Game.Rulesets; using osu.Game.Rulesets;
@ -47,7 +50,7 @@ namespace osu.Game.Input.Bindings
if (store != null) if (store != null)
{ {
foreach (var b in store.Query<DatabasedKeyBinding>(b => b.RulesetID == rulesetId && b.Variant == variant)) foreach (var b in store.Query<DatabasedKeyBinding>(b => b.RulesetID == rulesetId && b.Variant == variant))
Mappings.Add(b); KeyBindings.Add(b);
} }
} }
} }