1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Commit Graph

89 Commits

Author SHA1 Message Date
Dean Herbert
addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00
Dean Herbert
ede4d6dd11
Merge branch 'master' into mapping-del 2018-05-14 10:58:58 +09:00
Dean Herbert
a162453e9b Merge remote-tracking branch 'upstream/master' into joystick
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
2018-05-13 00:11:17 +09:00
Dean Herbert
3de3bb31f8 Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del 2018-04-25 18:10:28 +09:00
aQaTL
1dc8986c22
Switched back to switch 2018-04-18 15:06:03 +02:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
aQaTL
90beff83f6
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
aQaTL
38277bff35
Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
aQaTL
dbee936748
Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
smoogipoo
c39fb9a200 Update with framework changes 2018-04-03 20:10:26 +09:00
smoogipoo
e9ec544bf6 Implement joystick keybindings 2018-04-03 02:04:40 +09:00
Huo Yaoyuan
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08: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
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
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
Dean Herbert
af499df6dd Make a base OsuButton class to handle default samples 2017-11-26 17:17:48 +09:00
Dean Herbert
4f6263ef86 Make many internal classes and methods public
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
Shane Woolcock
98044a17d3 Fix misaligned settings buttons 2017-10-21 13:16:06 +10:30
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
MrTheMake
1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
70154d1036 Update usage of FadeEdgeEffect
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
Dean Herbert
c99ed6fd44 Add reset button
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dean Herbert
efdd5eb152 Fix global key bindings being fetched with a non-null variant 2017-08-23 16:10:31 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
smoogipooo
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
Dean Herbert
97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
Dean Herbert
ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00