1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 18:23:01 +08:00
Commit Graph

184 Commits

Author SHA1 Message Date
Dean Herbert
b936043956 Add the skin editor to the game 2021-04-29 17:20:22 +09:00
Dean Herbert
8961203f08 Move guid initialisation to database model itself 2021-04-26 17:06:03 +09:00
Dean Herbert
c0b1c2f39b
Merge branch 'master' into realm-key-binding-store 2021-04-24 02:40:15 +09:00
Dean Herbert
6dd48f204c Remove unused store resolution 2021-04-24 02:05:53 +09:00
Dean Herbert
f9603eefe5 Revert "Switch Guid implementation temporarily to avoid compile time error"
This reverts commit 4d976094d1.
2021-04-24 01:59:55 +09:00
Dean Herbert
a5364b224f Add simple key based time nudging support to editor 2021-04-22 18:47:04 +09:00
Dean Herbert
78f274d51a Merge branch 'master' into realm-key-binding-store 2021-04-22 12:13:23 +09:00
Dean Herbert
1ff4e2076f Merge branch 'master' into verify-tab 2021-04-13 23:05:48 +09:00
Dean Herbert
42604afcdc Add binding for verify mode (and move enum entry to end) 2021-04-12 16:15:27 +09:00
Dean Herbert
14bd5bdc77 Merge branch 'master' into verify-tab 2021-04-12 15:14:37 +09:00
Dean Herbert
995c244cee Remove alt-mousewheel bindings for volume adjustment
With the recent changes to the order of processing key bindings
(`GlobalAction`s are handled first), having the alt-wheel bindings in here causes a
regression as they are handled before `OnScroll` events.

Specifically, this means editor alt-scroll functionality no longer works
with the default bindings.

Removing the bindings fixes this, while also still allowing alt-wheel
adjustment of the volume via `VolumeControlReceptor`:

a2f50af424/osu.Game/Overlays/Volume/VolumeControlReceptor.cs (L21-L26)

In conjunction with the special case in `OsuScrollContainer`:

02d5b1352b/osu.Game/Graphics/Containers/OsuScrollContainer.cs (L103-L105)
2021-04-12 14:00:32 +09:00
Dean Herbert
8aff53172d Remove necessity for nested PassThroughInputManger 2021-04-08 15:18:31 +09:00
Dean Herbert
08858e6426 Reorder defaults to give non-global areas priority for global actions 2021-04-07 17:42:49 +09:00
Dean Herbert
afc745f999 Merge branch 'master' into rebind-song-select 2021-04-07 17:13:25 +09:00
Dean Herbert
f08b340e81 Add nullability hinting 2021-04-06 16:49:26 +09:00
Dean Herbert
beebdb0734 Clean up implementation 2021-04-05 22:30:51 +09:00
Dean Herbert
05961e98d5 Ensure GlobalActions are handled before anything else game-wide 2021-03-30 19:03:15 +09:00
Naxess
d58ef5310b Add verify tab
Currently empty, but works.
2021-03-28 17:36:22 +02:00
Dean Herbert
4d976094d1 Switch Guid implementation temporarily to avoid compile time error 2021-03-26 20:07:53 +09:00
Dean Herbert
68f2e7f61a Use realm support for Guid 2021-01-19 18:22:36 +09:00
Dean Herbert
86f66727de Update KeyBinding usages in line with interface changes 2021-01-15 14:57:01 +09:00
Dean Herbert
fcb4a53f37 Rename realm persisted properties to avoid casting necessity 2021-01-13 18:36:37 +09:00
Dean Herbert
9d744d629f Update existing usages to use the main realm context where applicable 2021-01-13 18:36:37 +09:00
Dean Herbert
192e58e0c6 Update all read queries to use direct realm subscriptions/queries 2021-01-13 18:36:37 +09:00
Dean Herbert
765d9cfae1 Use direct access for query pattern 2021-01-12 17:01:40 +09:00
Dean Herbert
8f9b19a76e Detach at point of usage, rather than point of retrieval 2021-01-12 14:45:36 +09:00
Dean Herbert
536e7229d0 Remove unused EF class and unnecessary interface 2021-01-12 14:45:36 +09:00
Dean Herbert
a1cb6d8c54 Remove unnecesssary local conversion method 2021-01-11 16:31:36 +09:00
Dean Herbert
8765aaf9e6 Use IKeyBinding for all key binding usages (and add update flow via primary key) 2021-01-11 16:31:35 +09:00
Dean Herbert
a77519c6bd Store KeyBinding action to its own field in realm
Also improve the Query method for action types by using generic field
2021-01-11 15:52:49 +09:00
Dean Herbert
43f417b53a Add and consume IKeyBindingStore interface 2021-01-11 15:52:49 +09:00
Dean Herbert
845d5cdea2 Switch guid to store as string until fody issues are resolved
See
https://github.com/realm/realm-dotnet/issues/740#issuecomment-755898968
2021-01-11 15:52:49 +09:00
Dean Herbert
d5ac97ece8 Add realm store / key binding implementations 2021-01-11 15:52:49 +09:00
Dean Herbert
283c69a68f Update enum name in line with changes 2021-01-06 23:12:56 +09:00
Dean Herbert
32accc8eab Remove "osu!direct" button 2021-01-06 22:56:10 +09:00
Joehu
b8c284b34f Fix one more key binding string not being sentence cased 2020-12-04 00:51:46 -08:00
Ryan Zmuda
e102f2e8fa Moved enum to bottom, change defualt bind to Shift-Tab, Fixed Notification 2020-11-30 21:38:16 -05:00
Ryan Zmuda
3994cf082d add keybind for in game overlay 2020-11-29 20:59:02 -05:00
Dan Balasescu
220657c2cc
Merge branch 'master' into replay-pausing-support 2020-11-27 00:09:40 +09:00
Dean Herbert
1e79cb498b Standardise binding description case to sentence casing 2020-11-26 20:07:16 +09:00
Dean Herbert
3346c06aca Rename variable/text to be more verbose as to toggle purpose 2020-11-26 20:04:44 +09:00
Dean Herbert
72b8eef36e Add ability to pause/resume replay playback 2020-11-24 15:41:56 +09:00
Dean Herbert
8d38d9cc93 Add hotkey to select random skin 2020-11-11 13:05:03 +09:00
Dean Herbert
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +09:00
Dean Herbert
260ca31df0 Change default mute key to Ctrl+F4 for now 2020-09-23 12:31:50 +09:00
Dean Herbert
3062fe4411 Add editor key bindings to switch between screens 2020-09-22 15:55:25 +09:00
Joehu
f4f642fbcf Add ability to skip cutscene with forward mouse button 2020-08-17 23:21:44 -07:00
Dan Balasescu
b64ddf061e
Remove whitespace 2020-07-14 20:37:21 +09:00
Dean Herbert
064814f70a
Merge branch 'master' into gameplay-pause-via-middle-mouse 2020-07-14 07:39:02 +09:00
Dean Herbert
08696b9bca Allow pausing gameplay via middle mouse button 2020-07-12 23:03:03 +09:00
vntxx
d18609e900 Added notifications keybinding
Implementation of #9502
2020-07-12 12:44:00 +02:00
Jack Boswell (boswelja)
e15324ca90 Shorten new binding descriptions 2020-06-15 21:44:38 +12:00
Dean Herbert
080bf1e85a Fix missing default inclusion 2020-06-15 13:46:16 +09:00
Joehu
b8fa1a2c41 Add shortcut to go home 2020-06-14 11:22:38 -07:00
Jack Boswell (boswelja)
7c04e9aca4 Move new GlobalAction keybinding entries to the end of the class.
The new keybindings shouldn't mess with existing bindings anymore
2020-06-07 15:37:19 +12:00
Jack Boswell (boswelja)
55953b9e85 Add a keybinding for selecting the previous random beatmap
Also gave the new actions more meaningful names
2020-06-03 18:13:18 +12:00
Jack Boswell (boswelja)
030b55ae85 Add a section to global keybind settings for song select 2020-06-03 17:55:15 +12:00
Dean Herbert
f3fee73441 Fix DatabasedKeyBindingContainer not using defaults for non-databased ruleset 2020-04-20 09:35:00 +09:00
Dean Herbert
6989738710 Change default global bindings for volume changing to include the alt key prefix 2020-03-02 18:59:05 +09:00
Dean Herbert
489bf16bea Add SelectNext and SelectPrevious global actions 2020-03-02 18:55:28 +09:00
Dean Herbert
ee73f3e2b2 Change matching mode for global actions to better discern similar binds 2020-03-02 18:54:00 +09:00
Joehu
f43602518a Add global action for toggling now playing overlay 2020-01-11 11:43:51 -08:00
Joehu
d188d33f18 Fix osu!direct global action not being bound to a key 2020-01-05 18:59:06 -08:00
Huo Yaoyuan
f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Dean Herbert
b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert
5963f7d914 Update comment 2019-08-13 19:52:40 +09:00
Dean Herbert
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
Dean Herbert
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
Lucas A
e4eed83d85 Add dual bindings for Jukebox hotkeys 2019-08-11 19:14:49 +02:00
Lucas A
7825923cb6 Use media keys as default bindings for jukebox. 2019-08-10 16:33:16 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
Dean Herbert
b6e15fb791 Update framework 2019-07-11 22:33:51 +09:00
Lucas A
b32b078e48 Set default keybindings for jukebox to stable's ones. 2019-07-10 21:55:43 +02:00
Lucas A
5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Lucas A
70372dd03d Add global actions for game-wide music jukebox manipulation 2019-07-05 16:14:04 +02:00
Dean Herbert
93b6d5b7e3 Fix keybindings being offset 2019-06-25 17:16:19 +09:00
Dean Herbert
2ea5165803 Change case to match; change hotkey to be more globally usable (previous has conflict on macOS) 2019-06-24 18:19:17 +09:00
Dean Herbert
d70248338d Merge remote-tracking branch 'upstream/master' into quickEscape 2019-06-24 18:14:48 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
smoogipoo
14ff4bc26a Move primary key attribute to IHasPrimaryKey 2018-11-28 13:19:23 +09:00
Scotsoo
4dab5db2e5 Allowing keypad enter to be used along with normal enter 2018-11-13 17:09:28 +00:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
HoutarouOreki
4cc22387d4 Avoid interversion key configuration conflicts 2018-07-11 12:03:05 +02:00
HoutarouOreki
ffe82aad25 Add basic quick exit functionality 2018-07-10 21:57:09 +02:00
Dean Herbert
5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +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
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
Dean Herbert
3844e95656 Fix one more instance of the same thing happening 2018-03-24 05:55:56 +09:00