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 |
|
Joehu
|
b8fa1a2c41
|
Add shortcut to go home
|
2020-06-14 11:22:38 -07: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 |
|