Commit Graph

28 Commits

Author SHA1 Message Date
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00
ede4d6dd11 Merge branch 'master' into mapping-del 2018-05-14 10:58:58 +09:00
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
3de3bb31f8 Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del 2018-04-25 18:10:28 +09:00
1dc8986c22 Switched back to switch 2018-04-18 15:06:03 +02:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
90beff83f6 Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
38277bff35 Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
dbee936748 Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
c39fb9a200 Update with framework changes 2018-04-03 20:10:26 +09:00
e9ec544bf6 Implement joystick keybindings 2018-04-03 02:04:40 +09:00
b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
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
1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
70154d1036 Update usage of FadeEdgeEffect
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
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
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00