Dean Herbert
|
b78c516b74
|
Merge branch 'master' into scoring-revamp
|
2017-09-13 20:47:14 +09:00 |
|
smoogipooo
|
093d82ac45
|
Set depths from playfield add methods instead of DrawableHitObject
|
2017-09-13 16:17:01 +09:00 |
|
smoogipooo
|
7b30fc8a09
|
Fix osu! slider initial circles being placed at the wrong depth.
|
2017-09-13 00:43:30 +09:00 |
|
smoogipooo
|
3386dbb243
|
Fix incorrect HitResult for slider ticks.
|
2017-09-13 00:37:18 +09:00 |
|
smoogipooo
|
d070fb8063
|
Actually make DrawableSliderTick return an OsuJudgement now
|
2017-09-12 19:48:35 +09:00 |
|
Dean Herbert
|
86de4fa2e2
|
Apply CI fixes
|
2017-09-12 18:36:19 +09:00 |
|
Dean Herbert
|
d7ac02d090
|
Ensure judgements aren't updated when ArmedState is not idle
|
2017-09-12 18:00:41 +09:00 |
|
Dean Herbert
|
1194e46ef1
|
Merge remote-tracking branch 'upstream/master' into judgement-revamp
|
2017-09-12 17:46:21 +09:00 |
|
smoogipooo
|
19db7a8f72
|
Update in line with framework changes.
|
2017-09-07 22:46:21 +09:00 |
|
smoogipooo
|
0cc443e618
|
Remove all generic judgements.
|
2017-09-06 18:05:51 +09:00 |
|
smoogipooo
|
29941019a5
|
Hacky way to make osu! and taiko work again.
|
2017-09-06 17:44:51 +09:00 |
|
smoogipooo
|
ac8ec31b61
|
Make judgements able to be "added" plus make everything compile and run.
|
2017-09-06 17:02:13 +09:00 |
|
Dean Herbert
|
84c22df3f5
|
Combine Judgement.HitResults into one.
|
2017-09-06 17:01:48 +09:00 |
|
smoogipooo
|
6a7b410bc3
|
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
|
2017-08-21 11:58:54 +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 |
|
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 |
|
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 |
|
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
|
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
|
e9a11ebc9f
|
Use new population methods and implement osu! ruleset actions
|
2017-08-10 18:31:12 +09: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 |
|
Thomas Müller
|
6063219b72
|
Update framework
|
2017-07-16 13:59:26 +03:00 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Dean Herbert
|
0e2dc9388a
|
More changes in-line with framework changes.
|
2017-07-10 12:55:47 +09:00 |
|
Dean Herbert
|
7952e7caa9
|
Fix typos
|
2017-07-10 03:22:08 +09:00 |
|
Dean Herbert
|
2c8b8c3f9c
|
Update loop logic in line with framework changes
|
2017-07-09 18:23:34 +09:00 |
|
Thomas Müller
|
bb15bc0467
|
Use ReceiveMouseInputAt whenever possible
|
2017-06-30 09:54:03 +03:00 |
|
Dean Herbert
|
7baa2b7421
|
Fix CI issues
|
2017-06-25 14:46:59 +09:00 |
|
Thomas Müller
|
e3489928b7
|
Remove now obsolete InternalContains
|
2017-06-24 09:21:08 +02:00 |
|
Thomas Müller
|
f5829860a2
|
Get rid of AlwaysReceiveInput
|
2017-06-23 18:02:24 +02:00 |
|
paparony03
|
62dee59672
|
Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
|
2017-06-20 15:54:23 +10:00 |
|
smoogipooo
|
ffbb46f668
|
Update in line with framework.
|
2017-06-12 12:48:47 +09:00 |
|
Péter Nemes
|
c624712f2f
|
Refactor ppv2 to allow integration of pp+ features.
|
2017-06-05 23:45:22 +02:00 |
|
Dean Herbert
|
5cb6963940
|
Make spinners easier for now
The underlying spin counting doesn't match stabnle, so they have been near impossible to complete until now.
|
2017-05-24 22:08:46 +09:00 |
|
smoogipooo
|
836bf930a0
|
More cleanups.
|
2017-05-23 15:29:38 +09:00 |
|
smoogipooo
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +09:00 |
|
Dean Herbert
|
82cf94bbff
|
Move spinner colours to local definition for now
We don't want to start polluting the OsuColours namespace with non-UI colours.
|
2017-05-22 09:50:45 +09:00 |
|
Dean Herbert
|
8f3ab79918
|
Simplify SpinnerTicks & CI fixes
|
2017-05-21 17:31:35 +09:00 |
|
Dean Herbert
|
95498fe6df
|
Adjust spinner colours making use of EdgeEffect.Hollow
|
2017-05-21 17:21:49 +09:00 |
|
Dean Herbert
|
3004a44b98
|
Further colour adjustments
|
2017-05-18 22:21:41 +09:00 |
|
Dean Herbert
|
c78dfb4a13
|
Oops colours were wrong
|
2017-05-18 21:56:19 +09:00 |
|
Dean Herbert
|
e3ae2bca6d
|
Design improvements
paired with smoogi
|
2017-05-18 21:38:19 +09:00 |
|
Dean Herbert
|
4100c4fe9f
|
Fix order of methods
|
2017-05-18 21:04:09 +09:00 |
|
Dean Herbert
|
ae676b48b2
|
Fix whitespace
|
2017-05-18 19:51:45 +09:00 |
|
Dean Herbert
|
9cd41c0e87
|
Spinner design refresh
|
2017-05-18 19:42:20 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
EVAST9919
|
7055c99df0
|
Added default value
|
2017-05-14 09:36:09 +03:00 |
|
EVAST9919
|
a4d5660e41
|
Cast SpinsRequired value to int
|
2017-05-14 09:22:49 +03:00 |
|
EVAST9919
|
ef23405733
|
Applied suggested changes
|
2017-05-14 06:45:35 +03:00 |
|
EVAST9919
|
6d9e11a74f
|
CI fixes
|
2017-05-13 03:10:13 +03:00 |
|
EVAST9919
|
5532d3ec49
|
storing OD value only
|
2017-05-13 03:04:40 +03:00 |
|
EVAST9919
|
86ebd9d663
|
spinner's progress depends on current map OD now
|
2017-05-13 02:51:58 +03:00 |
|
Dean Herbert
|
220c602218
|
Fix incorrect modifier order.
|
2017-04-28 13:27:20 +09:00 |
|
Dean Herbert
|
12c0a17711
|
Make FollowPoints dumb; use absolute sequence at renderer level.
|
2017-04-27 18:07:10 +09:00 |
|
Dean Herbert
|
4ab636cbb8
|
Update osu! drawables to use TransformSequences.
|
2017-04-27 17:37:38 +09:00 |
|
smoogipooo
|
28f7e0cdba
|
Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.
|
2017-04-26 14:12:21 +09:00 |
|
smoogipooo
|
1bb0b96ddc
|
Make IHasCurve not depend on a SliderCurve object.
|
2017-04-22 20:43:20 +09:00 |
|
smoogipooo
|
5cdbb226f8
|
Remove CurvedHitObject to make RepeatSamples not tied to curve.
|
2017-04-21 20:40:11 +09:00 |
|
smoogipooo
|
748f13501a
|
Remove HeadSamples and TailSamples, combine into RepeatSamples.
|
2017-04-21 20:04:40 +09:00 |
|
smoogipooo
|
a999c42d8a
|
Split slider samples into head + tail + repeats + body (the original HitObject.Samples).
|
2017-04-21 18:49:49 +09:00 |
|
smoogipooo
|
ca824de91c
|
Implement RepeatSamples in IHasRepeats.
|
2017-04-21 16:18:34 +09:00 |
|
Dean Herbert
|
705e66c7a1
|
Fix spinners becoming wonky.
|
2017-04-18 22:29:58 +09:00 |
|
Dean Herbert
|
fbd26a1d5e
|
Mode -> Ruleset.
|
2017-04-18 16:05:58 +09:00 |
|