h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 12:07:23 +08:00
Code Issues Releases Wiki Activity
51,787 Commits 3 Branches 648 Tags 270 MiB
9259aa94f1
Commit Graph

308 Commits

Author SHA1 Message Date
Dean Herbert
a6997a6fc6 Move ruleset key binding registration to an explicit method rather than the constructor 2021-01-12 15:21:02 +09:00
Dean Herbert
ff16d2f490 Mark classes nullable 2021-01-12 15:21:02 +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
406e640fa9 Make key binding update method support all kinds of realm object states 2021-01-12 14:45:36 +09:00
Dean Herbert
6fd098ca7c Add full xmldoc to RealmKeyBindingStore 2021-01-11 16:31:36 +09:00
Dean Herbert
56d34432f9 Move public members up 2021-01-11 16:31: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
391259c713 Add missing implementation details to realm keybinding store 2021-01-11 15:52:49 +09:00
Dean Herbert
ee6a26bd6e Initialise new key bindings with a primary key 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
Dean Herbert
7c0edb796e Always confine mouse to screen when running fullscreen 2020-12-04 20:49:18 +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
6014751e29 Add the ability for the game OSD to display user bindings 
Adds binding display for mouse button toggle / HUD toggle keys.

- [ ] Depends on #10786 for ease-of-merge
 2020-11-11 12:56:10 +09:00
Dean Herbert
8928aa6d92 Add key binding to show HUD while held 2020-10-30 14:19:40 +09:00
Shane Woolcock
7fff762dfc Rename IsGameplay 2020-10-07 16:14:49 +10:30
Shane Woolcock
c8c5998af4 Bail if FrameworkSetting.ConfineMouseMode is unavailable 2020-10-07 16:02:35 +10:30
Shane Woolcock
478f2dec96 Maintain the current gameplay state in OsuGame 2020-10-06 22:39:35 +10:30
Shane Woolcock
782fc1d60f Use OsuGame.OverlayActivationMode rather than per-Player 2020-10-06 20:27:35 +10:30
Shane Woolcock
1877312a91 Rename DuringGameplay 2020-10-06 20:27:35 +10:30
Shane Woolcock
5859755886 Use current OverlayActivationMode to determine confine logic 2020-10-05 11:11:46 +10:30
Shane Woolcock
4b6f893408 Merge branch 'master' into confine-during-gameplay 
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Screens/Play/Player.cs
 2020-10-05 10:23:37 +10:30
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
smoogipoo
1143d5d992 Update class exclusion for dynamic compilation 2020-09-04 20:41:08 +09:00
Joehu
f4f642fbcf Add ability to skip cutscene with forward mouse button 2020-08-17 23:21:44 -07:00
Shane Woolcock
ef3c8fa21f Add tracking component to handle OsuConfineMouseMode 2020-08-16 21:18:15 +09:30
Shane Woolcock
f98e96e45b Add osu!-specific enum for confine mouse mode 2020-08-16 10:52:23 +09:30
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
Dean Herbert
6c8b6f05f8 Fix key bindings switching order at random on consecutive "reset to defaults" 2020-07-08 15:24:26 +09: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
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +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
Huo Yaoyuan
e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +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
c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +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
smoogipoo
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09:00
Dean Herbert
8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert
4c2c7bd937 Fix global idle state being entered when overlays are visible 2019-01-04 16:26:10 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Jack Scotson
e11b2218cb
Merge branch 'master' into keypad-enter 2018-11-29 13:51:07 +00:00
smoogipoo
14ff4bc26a Move primary key attribute to IHasPrimaryKey 2018-11-28 13:19:23 +09:00
Dean Herbert
32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
Dean Herbert
266873740d Specify RelativeSizeAxes in ctor 
This is basically always the behaviour we want.
 2018-11-26 17:07:20 +09:00
Dean Herbert
68f0d25550 Mvoe private method to bottom 2018-11-26 16:33:58 +09:00
Dean Herbert
8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
Dean Herbert
fe5b043a59
Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin
285b199d7d Make IdleTracker IHandleGlobalInput 2018-11-19 20:50:46 +03:00
Roman Kapustin
3c0ce2b615 Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"" 
This reverts commit bcdaee7d39.
 2018-11-19 20:48:59 +03:00
smoogipoo
bcdaee7d39 Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" 
This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
 2018-11-19 17:52:31 +09:00
Scotsoo
4dab5db2e5 Allowing keypad enter to be used along with normal enter 2018-11-13 17:09:28 +00:00
Dean Herbert
eaa5ef5168
Merge branch 'master' into return_to_large_logo_after_idle 2018-10-12 22:14:23 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
Roman Kapustin
baf9e028c3 Fix possible idleTracker nullref 2018-09-26 19:44:01 +03:00
ekrctb
c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09: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
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