1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Commit Graph

104 Commits

Author SHA1 Message Date
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
smoogipoo
f0ec117bcb Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
7f0cb0bbf6 Add key bindings for scroll speed
Closes #2689.
- [ ] Depends on ppy/osu-framework#1569 being fixed.
2018-05-31 12:10:53 +09:00
Roman Kapustin
81d7e8a393 Resolve merge conflict 2018-05-18 00:25:47 +03:00
Roman Kapustin
e802b722f0 Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
This reverts commit 44bbb8700e.
2018-05-14 20:27:05 +03:00
Roman Kapustin
44bbb8700e Handle mouse back button using OnMouseDown override instead of using GlobalAction 2018-05-08 00:22:11 +03:00
smoogipoo
9f1efeb19d Move keybind to last in enum 2018-05-07 15:41:14 +09:00
smoogipoo
482ae2db87 Unify naming 2018-05-02 19:42:03 +09:00
smoogipoo
d4ada3000c Add keybind to disable mouse buttons 2018-05-02 19:37:47 +09:00
TocoToucan
42aa02579b Add 'Back' global key binding 2018-04-29 19:52:33 +03:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Dean Herbert
ddba7254ca Merge remote-tracking branch 'upstream/master' into linq 2018-04-03 13:05:08 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b Fix ScalableContainer irrepairably altering content size 2018-04-02 13:06:06 +09:00
Dean Herbert
3844e95656 Fix one more instance of the same thing happening 2018-03-24 05:55:56 +09:00
TocoToucan
604e725f3f Remove redundant code 2018-03-16 20:42:05 +03:00
TocoToucan
e6c22e2287 Taking screenshot support initial commit 2018-03-10 21:59:20 +03:00
Dean Herbert
8b37fde15b Only write when writes occur
Also add finaliser logic for safety. Also better threading. Also more cleanup.
2018-02-12 19:57:21 +09:00
Dean Herbert
edc3638175 DatabaseWriteUsage 2018-02-12 17:55:11 +09:00
Dean Herbert
5a99651561 Remove unnecessary arrays 2018-01-31 16:10:55 +09:00
Dean Herbert
b47061f43d Merge remote-tracking branch 'upstream/master' into mute-toggle 2018-01-31 14:20:15 +09:00
smoogipoo
b4cd8ea716 GlobalKeyBindingContainer -> GlobalActionContainer
Consitent with "FrameworkActionContainer".
2018-01-30 14:54:30 +09:00
smoogipoo
ef3fb8c05a InputManager -> Container where KeyBindings are involved 2018-01-30 14:49:12 +09:00
Dean Herbert
f823650b10 Allow user choice of the quick retry hotkey 2018-01-23 13:05:07 +09:00
aQaTL
9277586907
Toggle mute/unmute keyboard shortcut 2018-01-16 17:46:54 +01:00
smoogipoo
561786c5ef Generate the correct default bindings for variants 2018-01-15 19:25:14 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
b6fd5b0f17 Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay 2017-12-21 19:19:08 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
smoogipoo
8adf0a6db3 Null-check in disposal of DatabasedKeyBindingInputManager 2017-11-13 13:58:44 +09:00
Dean Herbert
41cc2f725a Fix incorrect comment 2017-10-25 23:56:10 +09:00
Dean Herbert
c260b0d2a5 Explicitly return list 2017-10-25 23:53:09 +09:00
Dean Herbert
e62928102c Merge remote-tracking branch 'upstream/master' into user-iqueryable 2017-10-25 23:49:56 +09:00
Dean Herbert
4ef80ee6c4 Fix potential incorrect update in KeyBindingStore 2017-10-25 23:21:47 +09:00
Dean Herbert
4e1922c556 Fix query methods not using IQueryable/Expressions
No database-level where clauses were being used in many cases they should be.
2017-10-25 22:10:45 +09:00
Dean Herbert
a5fb700229 Fix KeyBinding updates 2017-10-25 22:08:56 +09:00
TocoToucan
5107489cda Remove DatabaseBackedStore Reset functions 2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa Remove DatabaseBackedStore Prepare functions 2017-10-25 14:53:20 +03:00
Dean Herbert
df20845fbb Share one context per file store for performance reasons
There is now a CreateContext method for retrieving a stand-alone context for threaded use.

We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Dean Herbert
4a68dd88cb Centralise BeginTransaction and disable transaction use for now 2017-10-23 14:53:13 +09:00
Dean Herbert
7ba22f0028 Merge remote-tracking branch 'upstream/master' into import-test-fixes 2017-10-22 17:50:03 +09:00
Dean Herbert
9aa46bfb0d Add transaction usage for key binding defaults 2017-10-22 16:17:55 +09:00
Dean Herbert
1a7e23b5c1 Don't query database on keypress 2017-10-21 23:39:31 +09:00
Dean Herbert
4f392a867a Use a transaction for key binding population 2017-10-21 23:39:24 +09:00
Dean Herbert
e02640637a Fix KeyBindingStore regression 2017-10-17 17:08:01 +09:00
Dean Herbert
e487b6f82a Standardise context retrieval 2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b Add back transaction support for beatmap importing 2017-10-17 15:00:27 +09:00