1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Commit Graph

140 Commits

Author SHA1 Message Date
Dean Herbert
ea450fecf5 Merge branch 'master' into action-key-counter 2017-08-21 16:25:44 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3 Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147 2017-08-21 11:58:54 +09:00
Dean Herbert
09b5eef26e Fix incorrect osu! defaults 2017-08-20 21:56:28 +09:00
Dean Herbert
aebda8b032 Merge branch 'master' into fix-slider-tracking-outside-follow-circle 2017-08-20 18:27:38 +09:00
Shane Woolcock
71ddbd22a1 Convert ReceiveMouseInputAt override to lambda syntax, and make Tracking property private set 2017-08-20 14:00:53 +09:30
Shane Woolcock
51af233d66 Fix sliders not checking the correct cursor position once it moves out of the follow circle 2017-08-19 12:19:37 +09:30
Dean Herbert
f829caf197 Fix custom logic still existing in OsuInputManager 2017-08-19 07:24:29 +09:00
Dean Herbert
a8996b8b5f Merge branch 'master' into fix-sliders-ignoring-actions 2017-08-19 00:30:40 +09:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Shane Woolcock
7e0fe6cbcb Fix slider tracking to use pressed actions rather than directly querying the mouse buttons 2017-08-18 20:19:23 +09:30
Shane Woolcock
9558d2a161 Remove unnecessary using 2017-08-18 19:39:28 +09:30
Shane Woolcock
44feef78f1 Simplify OsuActionInputManager property 2017-08-18 19:32:08 +09:30
Shane Woolcock
529732ea47 More CI fixes 2017-08-18 16:58:01 +09:30
Shane Woolcock
90dacd9861 Trim whitespace 2017-08-18 16:49:10 +09:30
Shane Woolcock
9628c0b6d6 Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler 2017-08-18 16:46:00 +09:30
Shane Woolcock
9c6ca2d159 Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists 2017-08-18 16:34:01 +09:30
Shane Woolcock
f951120775 Merge branch 'master' into fix-spinner-ignoring-actions 2017-08-18 16:25:26 +09:30
Dean Herbert
a44ff5a2c2 Fix regression causing global hotkeys to no longer work 2017-08-17 17:47:44 +09:00
Dan Balasescu
f7ccc81875 Merge branch 'master' into fix-spinner-ignoring-actions 2017-08-17 12:33:18 +09:00
Shane Woolcock
b1abf83fee Change spinner action checks to switches 2017-08-16 17:51:57 +09:30
Shane Woolcock
9448e2f192 Remove unnecessary OnMouseDown/Up from SpinnerDisc 2017-08-16 17:25:48 +09:30
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Shane Woolcock
9e5deb63d1 Fix spinner not handling left/right action bindings 2017-08-15 16:42:26 +09:30
Dean Herbert
97ac8e1a64 Update usages of IsAlive/IsLoaded in line with framework changes 2017-08-15 13:57:48 +09:00
Dean Herbert
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
Dean Herbert
99458aab48 Propagate framework updates 2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
798fff00b2 Remove shortcomings, remove InputState.Data usage, make everything amazing
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Dean Herbert
e9a11ebc9f Use new population methods and implement osu! ruleset actions 2017-08-10 18:31:12 +09:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0 Give HitRenderer a reference to Ruleset
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
smoogipooo
cae21869d0 Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍. 2017-08-08 17:37:11 +09:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
440878945e Remove remaining usages of AddDelay 2017-07-17 18:16:15 +03:00
Thomas Müller
546efc0181 Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu 2017-07-17 17:05:24 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00