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

512 Commits

Author SHA1 Message Date
Dean Herbert
132241424d Apply FollowPoint alpha to inner container (should not affect legacy skins) 2018-07-31 15:59:06 +09:00
Dan Balasescu
0a7a2c83a8
Merge branch 'master' into fix-follow-circle-size 2018-07-31 15:41:15 +09:00
Dean Herbert
a98bb057e2 Fix follow circle being scaled far larger than it should be 2018-07-31 15:27:21 +09:00
tgi74000
36afae5a24 Remove the inner followcircle fade, Fade the entire followcircle instead 2018-07-30 13:43:02 +02:00
Dean Herbert
21f3ff6e77 Fix slider repeat points appearing far too late 2018-07-30 18:51:25 +09:00
Dean Herbert
f4cda695e6 Improve rotation handling in edge cases 2018-07-30 18:50:59 +09:00
tgi74000
c6aabc6d2d Move the FollowCircle border to its own container 2018-07-30 10:52:37 +02:00
Dean Herbert
a39188f762 Merge remote-tracking branch 'upstream/master' into peppy-fix-repeat-arrow-interpolation 2018-07-30 17:29:21 +09:00
tgi74000
84135c49ca Fix small FollowPoint rotation bug 2018-07-29 23:21:05 +02:00
tgi74000
18096490b6 Add support for followpoint skinning 2018-07-29 23:20:37 +02:00
tgi74000
4322475ad2 Add support for sliderb skinning (single frame only) 2018-07-29 22:29:07 +02:00
tgi74000
257c035f30 Add support for sliderfollowcircle skinning 2018-07-29 21:28:13 +02:00
tgi74000
52d9461f03 Add support for reversearrow skinning 2018-07-29 20:51:06 +02:00
tgi74000
2a9818a128 Add support for sliderscorepoint skinning 2018-07-29 20:42:05 +02:00
smoogipoo
ff2a3a6e92 Fix hitobjects not properly expiring if scrolling in the editor 2018-07-26 20:07:16 +09:00
Dean Herbert
10656be954 Add interpolation to repeat point during sliding 2018-07-23 16:55:38 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
79af5cb0a0 Limit shake duration to ensure it doesn't overlap miss window 2018-07-06 17:24:30 +09:00
Dean Herbert
e041352690 Add comment regarding add/clear/remove overrides 2018-07-06 13:19:43 +09:00
Dean Herbert
48d90a67ae xmldoc and formatting 2018-07-06 12:13:23 +09:00
Dean Herbert
aa96d91762 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-07-06 11:57:32 +09:00
Dean Herbert
d453414070 Forward shakes from slider head objects to sliders 2018-07-06 11:52:58 +09:00
tgi74000
558b2622a7 Move the Shake logic to a new ShakeContainer 2018-07-05 15:48:54 +02:00
Dean Herbert
1d6609d9f3 Add common custom words to dotsettings dictionary
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
smoogipoo
45a4187923 Tidy up lookups to NestedHitObjects 2018-07-02 16:10:56 +09:00
Dan Balasescu
f35ea18755
Merge branch 'master' into hit-shake 2018-06-29 17:38:02 +09:00
tgi74000
3d50050089 Move shake duration to a constant 2018-06-29 10:36:00 +02:00
Dan Balasescu
e3317b5145
Make method protected 2018-06-29 17:31:13 +09:00
Dean Herbert
098aeabc9e
Merge branch 'master' into catch-scoring 2018-06-29 17:16:14 +09:00
Dean Herbert
cacabeb67e Remove unused field 2018-06-29 17:00:41 +09:00
Dean Herbert
9d4bc7b630 Fix combo index being wrong 2018-06-29 01:34:47 +09:00
Dean Herbert
0a945e4709 Check whether initialised first 2018-06-28 22:44:40 +09:00
tgi74000
59e03fa528 Move Shake to DrawableOsuHitObject, Clean up Shake() 2018-06-28 15:33:59 +02:00
tgi74000
61c416dc16 Trigger Shake if HitCircles are hit too early 2018-06-28 13:41:23 +02:00
Dean Herbert
e197ebe4c5 Fix slider heads displaying in incorrect colour 2018-06-28 01:55:09 +09:00
smoogipoo
0366b0f081 The tail circle will always be the last hitobject 2018-06-27 12:09:40 +09:00
smoogipoo
80501de4b9 Add legacy slider offsets 2018-06-27 12:09:21 +09:00
Dan Balasescu
0b1b3319aa
Merge branch 'master' into update-framework 2018-06-19 20:57:19 +09:00
Dean Herbert
3819ecb2be Update framework 2018-06-19 20:19:52 +09:00
Tom Arrow
4aa89de2d7 Fix reverse arrow displayed with incorrect angle 2018-06-18 17:22:01 +02:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
smoogipoo
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo
d9c5a0c6d1 Fix position editing not working 2018-03-29 22:38:44 +09:00
smoogipoo
6d4f94756e Rewrite the way drag + click selections happen
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).

I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.

1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
Dean Herbert
af65f2dd48 Move AccentColour changes local to rulesets which rely on it 2018-03-22 18:53:16 +09:00
Dan Balasescu
ab9505652b Merge branch 'master' into skin--completion 2018-03-22 16:44:00 +09:00
smoogipoo
4ccaf143b5 Give sliders a default accent colour 2018-03-22 15:50:19 +09:00
Dean Herbert
78a8f60b39 IHasComboIndex -> IHasComboInformation 2018-03-22 12:35:17 +09:00
Dean Herbert
fb3d319d0e Make fallback bool into a function
Allows correct handling now that beatmap skins are also a thing.
2018-03-20 16:40:11 +09:00
Dean Herbert
cb3d0db555 Move combo colours completely out of HitObjects 2018-03-20 15:50:12 +09:00
Dean Herbert
a42035f494 Make DrawableHitObject a CompositeDrawable
No reason for it to be a container.
2018-03-15 13:41:06 +09:00
Dean Herbert
a0691168cb Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement 2018-03-14 15:35:24 +09:00
smoogipoo
212142429f Derive from IHasPosition 2018-03-12 17:25:34 +09:00
Dean Herbert
eb643b690a
Merge branch 'master' into more-skinning 2018-03-12 11:55:50 +09:00
Dean Herbert
d27cf16bf9 Merge remote-tracking branch 'ppy/master' into more-skinning 2018-03-12 10:46:37 +09:00
Dan Balasescu
8ba87dfdbd
Merge branch 'master' into fix-duplicate-judgements 2018-03-12 10:29:50 +09:00
smoogipoo
92b302971f Trim whitespace 2018-03-10 01:23:53 +09:00
smoogipoo
24501c37dd Merge branch 'drawableslider-cleanup' into editor-hitobject-movement 2018-03-10 01:15:24 +09:00
smoogipoo
8ed5fce43a Split out the slider head into a separate drawable hitobject 2018-03-10 01:13:59 +09:00
smoogipoo
376f6eec58 SetPosition -> OffsetPosition 2018-03-10 00:02:13 +09:00
smoogipoo
4a48136e4f Make hitobject positions adjustable 2018-03-09 23:12:34 +09:00
Dean Herbert
b62ed004f2 Remove judgements when deciding a new judgement for a HitObject
Generally happens when rewinding.
2018-03-07 19:14:42 +09:00
Dean Herbert
f2d7621df3 Add skin support for explode/flash layers
Basically to hide them for legacy skins, though.
2018-03-07 18:21:05 +09:00
Dean Herbert
05eb678654 Add skin support for judgements 2018-03-07 18:21:05 +09:00
Dean Herbert
4dfd3a61cc Remove alpha setting 2018-03-06 18:40:39 +09:00
Dean Herbert
7cf1d4450a SliderTick transform improvements 2018-03-06 18:28:36 +09:00
Dean Herbert
ea6e3938c0 Fix hard crash due to spinner spin requirement being zero
Resolves #2133.
2018-03-04 03:01:47 +09:00
Dean Herbert
0704d823a9 Fix slider selection point not being set to new origin 2018-03-01 22:03:00 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
2018-02-28 18:12:24 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00
Dean Herbert
1218a75b7f Improve vector conditional 2018-02-26 16:11:26 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
Dean Herbert
f1ddfa0581 Fix sliders never getting a correct lifetime set 2018-02-25 16:25:56 +09:00
smoogipoo
50d1183ec2 Division-by-zero safety + reference our own size 2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
8c90abe0dc Make slider control points relative to start position 2018-02-23 20:59:27 +09:00
smoogipoo
08bb25347c Make DrawableSlider contain the slider body 2018-02-23 20:27:05 +09:00
Dean Herbert
84b707f4f8 Add basic hitcircle skinning 2018-02-23 13:38:12 +09:00
smoogipoo
604b0fa20a Fix post-merge issues 2018-02-22 14:11:06 +09:00
smoogipoo
ded2644df8 Merge branch 'master' into editor-hitobject-overlays 2018-02-22 14:08:36 +09:00
Dean Herbert
3b4e4bd110 Merge remote-tracking branch 'upstream/master' into general-slider-improvements 2018-02-22 12:28:33 +09:00
smoogipoo
08e52e8c15 Remove unnecessary schedules 2018-02-21 18:02:52 +09:00
smoogipoo
9cd9c83f2c Allow changing accentcolour/bordercolour post-load 2018-02-21 18:00:46 +09:00
smoogipoo
f903e6d241 Fix stacking not working with sliders
Fixes #2093.
2018-02-21 17:46:45 +09:00
smoogipoo
f877b642da Clean up and document better what "progress" means 2018-02-21 17:10:18 +09:00
smoogipoo
7fe0989427 Merge branch 'general-slider-improvements' into editor-hitobject-overlays 2018-02-20 23:51:47 +09:00
smoogipoo
ee055b8e5c Allow customizing the snake-ability of sliders 2018-02-20 20:53:06 +09:00
smoogipoo
8270e4d758 Add BorderColour to SliderBody 2018-02-20 20:51:28 +09:00
smoogipoo
ad2f556133 Add hitobject overlays to selected hitobjects 2018-02-20 18:01:45 +09:00
Dean Herbert
58f20c3723
Merge branch 'master' into editor-hitobject-movement 2018-02-13 18:56:16 +09:00
smoogipoo
87baa6febd Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments 2018-02-12 19:08:13 +09:00
smoogipoo
cfb2b3f1e8 Rework SelctionLayer to support click-selections 2018-02-12 16:02:42 +09:00
Aergwyn
c3ce015869 fade slider ticks with hidden mod 2018-02-11 11:03:01 +01:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
c213e58eff Make slider tails not play hitsounds 2018-02-08 14:40:35 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
Dean Herbert
3d0ef8b3bd Move property back to local variable
Never used elsewhere
2018-02-06 18:14:08 +09:00
Dean Herbert
27fd42fb17 Adjust appear animations of repeats and ticks 2018-02-06 18:10:15 +09:00
Dean Herbert
e417aaa23f Adjust scale out effect 2018-02-06 17:46:56 +09:00
Dean Herbert
60fb78e49d Simplify iteration code 2018-02-06 17:46:45 +09:00
ColdVolcano
bf26fc94d8 Merge branch 'master' into repeat-points 2018-02-03 23:56:40 -06:00
smoogipoo
b15f184261 Make osu! use HitWindows 2018-02-02 20:33:59 +09:00
Dan Balasescu
cf665b717f
Merge branch 'master' into starrating-fix 2018-02-01 18:44:04 +09:00
Dan Balasescu
39e626f29e
Merge branch 'master' into fix-ticks-appearing-late 2018-02-01 18:28:42 +09:00
Dean Herbert
b8f6dcffaf Merge remote-tracking branch 'upstream/master' into repeat-points 2018-02-01 13:32:53 +09:00
ColdVolcano
06b615c474 Merge branch 'master' into repeat-points 2018-01-31 21:30:28 -06:00
smoogipoo
cd4a0612c0 Properly construct slider ends using HitObject.AddNested 2018-01-30 16:53:19 +09:00
smoogipoo
27357e100a Simplify condition 2018-01-30 16:28:38 +09:00
smoogipoo
702c4efb88 Give Slider a tail hitobject to make slider ends counts towards score 2018-01-30 16:28:14 +09:00
smoogipoo
b293408147 Construct the head of sliders from Slider 2018-01-30 15:50:48 +09:00
Aergwyn
373b3871f9 update SliderTick calculation + more ticks in tests
math is hard >_<
2018-01-29 12:03:44 +01:00
Thomas Tan
33c5fdcedb AppVeyor fix 2018-01-29 16:30:46 +08:00
Thomas Tan
c36859ea3a Create Slider.StackedPositionAt method 2018-01-29 16:22:14 +08:00
Aergwyn
214938b98d fix SliderTicks appearing too late 2018-01-25 10:52:03 +01:00
ColdVolcano
1f51149da8 Add xmldoc 2018-01-24 15:41:51 -06:00
ColdVolcano
cee8bb50c9 Fix reference points being wrongly selected 2018-01-24 15:34:52 -06:00
Aergwyn
52c4d22c41 review changes
- use doubles instead of floats
- simplify logic
2018-01-24 09:44:50 +01:00
Aergwyn
4baadfdd16 fix oversight 2018-01-23 16:44:33 +01:00
ColdVolcano
efae00c149 make repeat points look better 2018-01-23 04:31:37 -06:00
Aergwyn
24b7d91f5b Merge branch 'master' into fix-repeats-appearing-early 2018-01-23 09:04:45 +01:00
smoogipoo
33c52ba30f Fix off-by-ones in RepeatPoint code 2018-01-23 13:58:43 +09:00
smoogipoo
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
Aergwyn
b726f90c37 remove unnecessary variable 2018-01-22 12:44:55 +01:00
Aergwyn
66176f2882 fix RepeatPoint animations
- FadeIn and -Out for RepeatPoints are now calculated instead of fixed values
- TimePreempt is now cut down if too long for RepeatPoints following the first one to only show up to two RepeatPoints at any given time
2018-01-22 12:36:38 +01:00
Shawdooow
29466438a3 fix values 2018-01-19 20:58:43 -05:00
Shawdooow
c29eea870d correct values 2018-01-19 20:56:41 -05:00
Shawdooow
e109d5fe20 fix slider heads 2018-01-19 11:13:49 -05:00
Shawdooow
4d1142a0ce overall difficulty 2018-01-19 11:11:28 -05:00
smoogipoo
6908597b95 Fix inverted ternary
See #1935 - repeat index 1 is at the end of the slider, not the start.
2018-01-18 23:44:00 +09:00
Dan Balasescu
46ba2cda10
Remove unused using 2018-01-18 21:19:06 +09:00
Dean Herbert
1a83770a06 Fix incorrect math 2018-01-18 21:16:15 +09:00
Dean Herbert
065d2a4887 Add licence header 2018-01-18 21:12:53 +09:00
Dean Herbert
01ff1584c2 Fix repeat points not following slider snaking correctly 2018-01-18 21:06:47 +09:00
Dean Herbert
e2965e1682 Remove unused using 2018-01-18 20:46:57 +09:00
Dean Herbert
063767e381 Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
Dean Herbert
97884e1d05 Remove unnecessary null checks 2018-01-18 19:57:49 +09:00
Dean Herbert
b4f2bea37b Fix slider samples playing twice when additions are present 2018-01-18 19:50:26 +09:00
Dean Herbert
9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
Dean Herbert
e5056e11f4 Remove extra newline 2018-01-12 18:07:40 +09:00
Dean Herbert
d0881e443b Merge remote-tracking branch 'upstream/master' into approach-rate 2018-01-12 18:05:16 +09:00
Dan Balasescu
9c602f8770
Merge branch 'master' into drawable-fruit-improvements 2018-01-09 22:06:16 +09:00
TocoToucan
ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert
0cc8516aa3
Remove empty cases, add initial ball scale adjust. 2018-01-04 20:53:33 +09:00
Dean Herbert
717b263b77 Comment and better stacking of FadeOuts 2018-01-04 20:47:42 +09:00
Dean Herbert
1f62fe19d5 Make animation a bit more subtle 2018-01-04 20:43:42 +09:00
Dean Herbert
ffc7f7ecf4 Add a better slider "hit" state fade out animation 2018-01-04 20:16:10 +09:00
Dean Herbert
bde957940d Disallow SliderBall from contracting after EndTime 2018-01-04 20:09:58 +09:00
Shawdooow
94f81a1784 fix 2018-01-03 10:04:36 -05:00
Shawdooow
9122eaa28e
Merge branch 'master' into approach-rate 2018-01-03 10:02:55 -05:00
Shawdooow
23f3cb6467 address review 2018-01-03 10:01:28 -05:00
Aergwyn
1ce6219293 remove unnecessary override 2018-01-03 13:55:24 +01:00
Aergwyn
d94c313947 fix slider follow circle instantly disappearing on slider ends 2018-01-03 08:13:58 +01:00
Dean Herbert
31865b4d96 Rename conflicting variable 2018-01-03 15:12:27 +09:00
Aergwyn
481a16b491 extended hitobject tests 2018-01-01 11:55:30 +01:00
Shawdooow
1502fde1b0 fix slider start circles 2017-12-31 12:04:31 -05:00
Shawdooow
064758b96d fixes 2017-12-31 11:30:58 -05:00
Shawdooow
3ba5dce052 new Approach to approach rate 2017-12-31 11:15:14 -05:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert
233904ddef
Merge branch 'master' into scaling-repeat-points 2017-12-30 18:09:32 +09:00
Aergwyn
1f71bd3425 scale the correct part of the repeat point 2017-12-30 09:05:40 +01:00
Dean Herbert
7f54778fed
Merge branch 'master' into hitobject-constructor-safety 2017-12-30 15:32:36 +09:00
Dean Herbert
a2840d2519 Fix FadeInDuration not being passed down to sliders' InitialCircle 2017-12-30 15:21:25 +09:00
smoogipoo
b99e0a0439 Fix DrawableHitCircle accepting a base OsuHitObject parameter
Fixes #1778.
2017-12-30 14:15:42 +09:00
Aergwyn
52dd5ddba6 fix repeat points not scaling properly 2017-12-29 20:03:43 +01:00
Aergwyn
07040f9fd1 rename field 2017-12-29 17:52:28 +01:00
Dean Herbert
a4f941cdf1 Move lifetime adjustment to DrawableHitCircle 2017-12-29 18:51:14 +09:00
Aergwyn
0b23ceb781 fix slider fade out to be eased
+ move duration calculation to not be done twice
+ made Slider / Spinner private again as they are not accessed externally anymore
2017-12-28 15:36:27 +01:00
Aergwyn
dbcf87267d Merge branch 'master' into standard-hd-support 2017-12-27 21:26:39 +01:00
Aergwyn
e42fa7205b adjust spinner sequence to the new fadeout speed 2017-12-27 21:23:56 +01:00
smoogipoo
1a5cf98e0c Fix repeat points always being placed at end position of th slider
PositionAt is clamped to [0, 1] where 0 denotes the beginning of the curve and 1 denotes the end of the curve. It has no concept of repeats.
2017-12-27 20:40:38 +09:00
smoogipoo
c18fd5da48 Simplify creation of repeat points 2017-12-27 20:37:28 +09:00
smoogipoo
cb18baa4d8 Add HitCircle/Slider testcases 2017-12-27 17:34:07 +09:00
smoogipoo
ce18a0705d Merge remote-tracking branch 'origin/master' into sliderbouncers-fix 2017-12-27 16:48:04 +09:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
Shawdooow
72b5a370da dont play the same sound twice at once 2017-12-23 23:13:53 -05:00
Shawdooow
af2a2781e7 fix the fix harder 2017-12-23 23:12:10 -05:00
Shawdooow
d333fc5efe fix the fix
silly me, that was configured for vitaru!
2017-12-23 23:08:55 -05:00
Shawdooow
a656656403 the fix 2017-12-23 22:47:32 -05:00
Aergwyn
47c75d01ce access list with index instead of using LINQ 2017-12-23 13:30:44 +01:00
Aergwyn
c5aba9f247 add Samples to RepeatPoint construction 2017-12-23 12:32:21 +01:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
smoogipoo
6a29f6020a Make HitObjects construct nested hit objects 2017-12-22 21:42:54 +09:00
smoogipoo
ac1d27e925 Fix possible nullref exceptions 2017-12-21 23:02:46 +09:00
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
a303bf71cf Give control over screen space conversion to DrawableHitObject 2017-12-11 22:19:02 +09:00
smoogipoo
cf859a6cf2 Make the dragger attach to objects it surrounds
Plus a lot more implementation.
2017-12-02 00:26:02 +09:00
smoogipoo
eb03b0db30 Consider slider lengths as part of Distance 2017-11-17 21:28:59 +09:00
smoogipoo
c221cfd30c Fix slider cursor positions not being taken into account 2017-11-17 20:28:41 +09:00
smoogipoo
66ee9d1631 Update in-line with framework changes 2017-11-09 17:04:04 +09:00
smoogipoo
348083f589 Update with framework state transformation
Removes explicit initial state setting in DrawableOsuHitObjects.
2017-11-09 14:05:05 +09:00
smoogipoo
c7426ebed8 Fix spinners showing very weird numbers after rewinding
Fixes #1462
2017-11-06 17:22:22 +09:00
smoogipoo
4854302aaa Fix follow points not showing up again after rewinding
Fixes #1463.
2017-11-04 01:02:33 +09:00
smoogipoo
5fd3115142 Fix slider ball not animating fade/scale after rewinding
Fixes #1455
2017-11-03 15:58:12 +09:00
smoogipoo
60048e6cd1 Fix slider ticks not showing up again once replayed
Fixes #1456
2017-11-03 15:33:24 +09:00
smoogipoo
06a62edeb6 Make DrawableRepeatPoints show up when replayed
Fixes #1458
2017-11-03 15:30:46 +09:00
smoogipoo
70ea3e5025 Fix up initial scale of DrawableRepeatPoint 2017-11-03 15:29:16 +09:00
smoogipoo
240997e4fb Remove duplicate property 2017-11-02 21:56:18 +09:00
smoogipoo
6883b3742f Make initial DrawableOsuHitObject initial states not use transforms 2017-11-02 20:23:28 +09:00
Dean Herbert
ad685bd919 Merge branch 'master' into sliderbouncers 2017-10-22 14:12:03 +09:00
Shawdooow
a0cb624c9d start at 1 2017-10-12 10:28:55 -04:00
Dean Herbert
1b031ca328 Fix potential read from empty queue in SPM counter 2017-10-12 18:28:26 +09:00
Dean Herbert
2b309be3c2 Merge remote-tracking branch 'upstream/master' into spm-counter 2017-10-11 11:23:09 +09:00
Dean Herbert
e76961a932 Remove unnecessary bool 2017-10-11 11:23:02 +09:00
Dean Herbert
1fc16693d6 Formatting 2017-10-11 11:20:44 +09:00
Dean Herbert
d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
Huo Yaoyuan
09093013a7 Move spm calculation into counter. 2017-10-07 15:58:53 +08:00
Huo Yaoyuan
a876ab9b90 Move spm counter to a seperated control. 2017-10-07 15:31:42 +08:00
Huo Yaoyuan
404c4917dc Use single queue for spinning record. 2017-10-06 20:42:24 +08:00
Huo Yaoyuan
29f9c8143d Use RotationAbsolute to calculate spm. 2017-10-05 20:08:45 +08:00
Huo Yaoyuan
ee8746b848 Fade in spm texts. 2017-10-05 20:07:33 +08:00
Huo Yaoyuan
24187cc53a Move spm text out of scaled parts. 2017-10-05 19:55:20 +08:00
Huo Yaoyuan
134e1299bb Update spm value when spinner not active. 2017-10-05 19:23:58 +08:00
Huo Yaoyuan
3de42ee405 Smooth spm values into a time range. 2017-09-30 15:23:10 +08:00
Huo Yaoyuan
e2e26c91af Show SPM value basically. 2017-09-29 22:30:41 +08:00
Huo Yaoyuan
40a27c810a Calculate SPM in spinner disc. 2017-09-29 19:24:14 +08:00
Shawdooow
cfb1804aa1 address review 2017-09-27 11:28:44 -04:00
Shawdooow
801fa39145 remove old SliderBouncer 2017-09-26 12:23:13 -04:00
Shawdooow
b5ad6ae735 appveyor fixes 2017-09-26 12:21:39 -04:00
Shawdooow
adebe166d4 slider bouncers 2017-09-26 12:13:34 -04:00
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