1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

302 Commits

Author SHA1 Message Date
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
Dean Herbert
66894d11ea Connection -> context 2017-10-17 12:46:29 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
Dean Herbert
7049a73490 Remove ValidTypes from databased stored; explicitly expose query methods instead 2017-10-16 14:47:33 +09:00
Dean Herbert
5b6c331434 Fix all keybindings being reset every startup 2017-10-16 14:12:08 +09:00
Dean Herbert
4981630131 Fix formatting regressions 2017-10-16 13:12:51 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
TocoToucan
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
Dean Herbert
a7a7e0323f Update autoplay and replay handling to result in actions, not keys 2017-08-24 15:36:42 +09:00
smoogipooo
fd3239ad15 Fix KeyBindingStore not getting correct defaults for variants. 2017-08-23 12:36:53 +09:00
Dean Herbert
18645fcf29 Update volume control logic to use key bindings
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Jorolf
9b20da94e7 change Query to AllRulesets 2017-08-19 22:07:03 +02:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Dean Herbert
a44ff5a2c2 Fix regression causing global hotkeys to no longer work 2017-08-17 17:47:44 +09:00
smoogipooo
cceeb864d5 Fix hitobjects in TestCaseHitObjects not receiving actions. 2017-08-17 12:16:33 +09:00
Dean Herbert
09089a3126 Fix potential nullref 2017-08-16 23:20:08 +09:00
Dean Herbert
c41ba7b704 Update with latest framework changes 2017-08-16 22:56:32 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
54698f2d8f Use IntAction instead of new 2017-08-16 17:27:09 +09:00
Dean Herbert
2bd0981738 Improve default key binding logic
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00
Dean Herbert
3bee36f6a2 Add index to Action column
Is used for default assignment
2017-08-15 23:59:06 +09:00
Dean Herbert
46bfa4db29 Load defaults, pass around live IEnumerable, add PK for updating 2017-08-14 22:31:23 +09:00
Dean Herbert
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
Dean Herbert
b6fb68c6e2 Update framework 2017-08-12 22:13:40 +09:00
Dean Herbert
99458aab48 Propagate framework updates 2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
8ae010f62b Don't pass through repeat events if we've already handled an action 2017-08-11 11:46:21 +09:00
Dean Herbert
a93a92a2bb Remove GlobalHotkeys 2017-08-10 19:52:45 +09:00
Dean Herbert
641b3bd27e Improve documentation 2017-08-10 19:36:47 +09:00
Dean Herbert
798fff00b2 Remove shortcomings, remove InputState.Data usage, make everything amazing
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
e9a11ebc9f Use new population methods and implement osu! ruleset actions 2017-08-10 18:31:12 +09:00
Dean Herbert
b6bb07c0b5 Add ConcurrentActionModes to support osu! gameplay more easily 2017-08-10 18:28:22 +09:00
Dean Herbert
c82db54fb5 Rename OsuAction to GlobalAction 2017-08-10 17:22:08 +09:00
Dean Herbert
6ba5bdf1e6 Add description attributes to all actions 2017-08-10 17:14:30 +09:00
Dean Herbert
da50101c25 Don't match on partial key chords when concurrent is disallowed 2017-08-10 16:45:33 +09:00
Dean Herbert
d9e36237c7 Move all OsuGame events to OsuAction 2017-08-10 16:45:10 +09:00
Dean Herbert
30bd1d70b5 ActionMapping doesn't support concurrent actions by default
But can when required. Also supports key combination bindings now.
2017-08-10 16:08:43 +09:00
Dean Herbert
720bd38d8e Fix CI issues 2017-08-09 17:30:37 +09:00
Dean Herbert
34b12fbfa4 Add global actions; improve default assignment 2017-08-09 17:10:32 +09:00
Dean Herbert
3b48a6c668 Fix CI issues 2017-08-09 15:15:41 +09:00
Dean Herbert
976cff9af6 Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
Dean Herbert
c70f96a9cd Add basic documentation and split out classes. 2017-08-09 14:50:10 +09:00
Dean Herbert
f21b370f4e Add variant for rulesets with more than one possible key layout 2017-08-09 13:23:23 +09:00
Dean Herbert
7c0e7ebcd0 Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Dean Herbert
eee6404986 Store bindings to database 2017-08-09 12:37:47 +09:00
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Dean Herbert
9a1c662d1f Update framework 2017-05-11 21:25:43 +09:00
Dean Herbert
1b03998b86
Improve comment of SetFrameFromTime. 2017-03-06 14:15:43 +09:00
Dean Herbert
adb6f01e39
Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
Dean Herbert
58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
Dean Herbert
a621a65eb5
Fix GlobalHotkeys not working (regression due to masking rules). 2017-02-20 15:31:15 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
47faf8f40d Add in-game chat display, along with a global hotkey handling method. 2016-10-08 19:23:21 +09:00