1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 19:27:26 +08:00
Commit Graph

5186 Commits

Author SHA1 Message Date
Dean Herbert
74f794a549
Fix repeat circles on sliders not correctly getting dimmed 2023-10-25 14:01:55 +09:00
Dean Herbert
23ea128f30
Merge branch 'master' into velocity-based-ball-animation 2023-10-25 14:01:19 +09:00
Dean Herbert
121fa6f165
Simplify pre-checks in HitObjectApplied delegate 2023-10-25 13:53:20 +09:00
Dean Herbert
34505b3933
Merge pull request #25185 from bdach/minimum-sample-volume 2023-10-24 22:04:43 +09:00
Dean Herbert
bf313cc732
Merge pull request #25216 from bdach/spinner-tick-lifetime
Fix spinner ticks not playing samples correctly sometimes
2023-10-24 19:12:49 +09:00
Dean Herbert
5503407907
Force miss head when a tick or repeat is successfully judged 2023-10-24 19:10:57 +09:00
Dean Herbert
5eefc5323d
Standardise DrawableSliderRepeat / DrawableSliderTick judgement implementations 2023-10-24 19:10:57 +09:00
Dean Herbert
176cb0dd28
Remove unused variable 2023-10-24 19:10:57 +09:00
Dean Herbert
93147a5998
Change slider tail tick to only hold back judgement on ticks/repeats 2023-10-24 19:10:57 +09:00
Dean Herbert
68397f0e81
Remove unused using 2023-10-24 18:01:24 +09:00
Bartłomiej Dach
a0c8158033
Remove unnecessary LifetimeEnd specification 2023-10-24 10:42:03 +02:00
Bartłomiej Dach
0e5a521695
Merge pull request #25157 from peppy/spinner-anti-cheese-final
Fix spinner cheese by accounting for spin directionality
2023-10-24 08:13:32 +02:00
Dean Herbert
ded99c4097
Simplify calculation 2023-10-24 14:32:03 +09:00
Salman Ahmed
ff66b74b0e Refactor logic to support DHO pooling 2023-10-24 02:24:00 +03:00
Bartłomiej Dach
cfd8d05fde
Fix spinner ticks not playing samples correctly sometimes
Noticed this during work on https://github.com/ppy/osu/pull/25185.

In some circumstances, it seemed that spinner bonus ticks (and mostly
them specifically) would not always play with the correct volume.
Hours of debugging later pointed at a trace at
`DrawableAudioWrapper.refreshLayoutFromParent()` not firing sometimes.

Initially I thought it to be some sort of framework bug, but after
preparing a diff and running final checks, I noticed that sometimes
the sample was being played *by a `PoolableSkinnableSample` that wasn't
loaded*. And determining why *that* is the case turned out with this
diff.

As it happens, spinner ticks get assigned a start time proportionally,
i.e. the 1st of 10 ticks is placed at 10% of the duration, the 2nd
at 20%, and so on. The start time generally shouldn't matter,
because the spinner is manually judging the ticks. *However*, the ticks
*still* receive a lifetime start / end in the same way normal objects
do, which means that in some cases they can *not be alive* when they're
hit, which means that the `DrawableAudioWrapper` flow *hasn't had
a chance to run*, and rightly so.

To fix, ensure that all spinner ticks are alive throughout the entirety
of the spinner's duration.
2023-10-23 21:29:55 +02:00
Salman Ahmed
0cf572d029 Use existing property and fix nullability 2023-10-23 11:46:21 +03:00
Dean Herbert
4e057b446a
Rename accumulated rotation variable 2023-10-23 16:46:15 +09:00
Dean Herbert
d0599496bd
Merge pull request #25177 from peppy/spinner-max-display 2023-10-21 11:10:09 +09:00
Salman Ahmed
2a70c331b9 Remove animation support from osu! slider reverse arrow 2023-10-20 23:59:03 +03:00
Salman Ahmed
80ce78e05d Remove animation support from osu! hit circle overlay 2023-10-20 23:59:03 +03:00
Salman Ahmed
7373a9a784 Remove unnecessary usage of ApplyWithDoubledAlpha 2023-10-20 23:54:29 +03:00
Salman Ahmed
ac8c2a173b Apply velocity into legacy slider ball animation rate 2023-10-20 22:47:45 +03:00
Bartłomiej Dach
b321d556b6
Enforce minimum gameplay sample volume of 5% 2023-10-20 15:50:13 +02:00
Dean Herbert
3fb74cb5f9
Move helper method to LegacyRulesetExtensions and stop applying rounding allowance to catch
As discussed, it isn't used in stable like this. Was a mistake.
2023-10-20 18:57:14 +09:00
Dean Herbert
2ba6286470
Merge branch 'master' into fix-circle-radius 2023-10-20 18:53:36 +09:00
Dean Herbert
686c45e21b
Merge branch 'master' into legacy-tick-test-coverage 2023-10-20 16:41:32 +09:00
Dean Herbert
ca3a3f600e
Update visuals of spinner implementations to show MAX score differently 2023-10-20 16:11:09 +09:00
Dean Herbert
181a98e8ef
Remove duplicate definition of bonus text in ArgonSpinner 2023-10-20 16:10:54 +09:00
Dean Herbert
3986cec949
Cap bonus score more correctly 2023-10-20 16:10:54 +09:00
Dean Herbert
f16400929d
Update bindable flow to expose every spin, even after max bonus is reached 2023-10-20 15:38:04 +09:00
Bartłomiej Dach
dcfd6a0a8a
Remove DistancedHitObjectComposer inheritance from osu! composer 2023-10-19 11:46:30 +02:00
Bartłomiej Dach
3ab083b696
Split IPositionSnapProvider from IDistanceSnapProvider
In preparation to remove `DistancedHitObjectComposer`, split off
`IPositionSnapProvider` from `IDistanceSnapProvider`.

`DistancedHitObjectComposer` was not touching `IPositionSnapProvider`'s
only interface member at all, it was just forwarding it for subclasses
to override to their own leisure.
2023-10-19 11:45:24 +02:00
Dean Herbert
3a5490892c
Centralise and repair circle size calculations game-wide 2023-10-18 19:50:42 +09:00
Dean Herbert
6ae82c5e73
Fix circle scale not matching stable due to missing multiplier
This multiplier has to exist.

I'm not guaranteeing that the rest is correct here. Should we be doing
proper cross-testing on this? Maybe, but it's going to be hard to get
right. We could likely check as far as "game pixels", but there's still
a chance that the osu-framework could be doing something weird in the
rest of the hierarchy where playfield scale is involved.

Closes https://github.com/ppy/osu/issues/25162. Tested to fix the linked
replay.
2023-10-18 18:35:14 +09:00
Dean Herbert
54da6f1048
Merge pull request #25160 from bdach/repeat-arrow-hidden-fade
Adjust slider repeat transforms to closer match stable
2023-10-18 18:03:48 +09:00
Dean Herbert
92524d4299
Remove incorrect plural from variable 2023-10-18 17:44:01 +09:00
Dan Balasescu
939b55020c
Merge branch 'master' into legacy-tick-test-coverage 2023-10-18 15:21:31 +09:00
Bartłomiej Dach
f3cda58474
Fix legacy slider repeats becoming much too large on hit
They had scale transforms applied to them in two places: the actual
legacy pieces themselves (esp. `LegacyHitCirclePiece`), and on the
`DrawableSliderRepeat` level.

This change moves all of the scale transforms to the skinnable pieces.
Argon and triangles have received a copy of the previous logic each,
so behaviour on those skins should not change.
2023-10-17 14:47:44 +02:00
Bartłomiej Dach
30e5f47007
Instantly fade out slider repeats when hidden is active 2023-10-17 14:15:21 +02:00
Dean Herbert
4f0d55e1a9
Clean up code and add xmldoc and inline doc 2023-10-17 20:24:23 +09:00
Dean Herbert
af7180a5b5
Add SpinnerSpinHistory and tests 2023-10-17 20:10:22 +09:00
Dean Herbert
5341a335a6
Bypass Parent nullability checks for now 2023-10-17 17:48:45 +09:00
Dean Herbert
0bb95cfa88
Fix incorrect initial rotation transfer value
Should have been removed as part of https://github.com/ppy/osu/pull/24360.
2023-10-16 19:34:55 +09:00
Dean Herbert
10bab61441
Tidy up lastAngle usage and add assertion of maximum delta 2023-10-16 19:34:22 +09:00
Dean Herbert
159b24acf7
Rename RateAdjustedRotation to TotalRotation 2023-10-16 18:25:03 +09:00
Dan Balasescu
84be714d6b
Fix large instantaneous delta on first frame
Happens when the first update frame comes in before any mouse input.
2023-10-16 18:17:11 +09:00
Bartłomiej Dach
8a4c2624bd
Merge branch 'master' into fix-hr-cs-mania-adjustment 2023-10-13 16:08:54 +02:00
Dean Herbert
0b64852181
Limit sliderscorepoint to hitcicle dimensions
You'd never use anything above this unless crazy.
2023-10-13 15:43:20 +09:00
Dean Herbert
17df2fdf01
Restrict followpoint size
See https://github.com/ppy/osu/issues/24940#issuecomment-1760980461.
2023-10-13 15:42:49 +09:00
Dean Herbert
a3b21281e6
Add reordering support to match existing diffcalc 100% 2023-10-13 14:25:38 +09:00
Dean Herbert
3849b11644
Fix "Hard Rock" mod affecting CS/AR in osu!mania
Closes https://github.com/ppy/osu/issues/25090.

Not sure if there are other exceptions we should account for here.
2023-10-12 19:48:47 +09:00
Dean Herbert
5ffc25c8e8
Fix potential failure when slider has no ticks 2023-10-12 03:19:43 +09:00
Dean Herbert
63843c79c3
Amend diffcalc to use something closer to the original calculation for now 2023-10-11 21:12:04 +09:00
Dean Herbert
0ca05d986d
Merge pull request #25067 from bdach/approach-circle-cutoff
Adjust approach circle maximum size limits for backwards compatibility
2023-10-10 17:05:16 +09:00
Bartłomiej Dach
71c4b138fb
Merge branch 'master' into fix-legacy-score-multipliers-2 2023-10-09 10:53:14 +02:00
Dean Herbert
ad6f04cfb0
Hotfix approach circle cutoff 2023-10-09 10:16:57 +02:00
Bartłomiej Dach
96bb8ed150
Apply feedback regarding maximum osu! element sizings
- `default-N` number sprites maximum size increased by 1.25x to a total
  of 320x320 to counteract the 0.8x factor applied onto them when
  displayed on a hitcircle.

- `sliderb` and parts' maximum size increased to 384x384, to match
  `sliderfollowcircle`, as the two are apparently sometimes used
  interchangeably by skinners to achieve different visual effects.
2023-10-05 22:33:49 +02:00
Bartłomiej Dach
0ae4a0f11f
Adjust gameplay element maximum size limits for backwards compatibility
The new limits were chosen by sampling across over 4000 skins. The
methodology for doing so is described in the following gist:

	https://gist.github.com/bdach/6228ba41d128b23d1f89142f404108a3
2023-10-05 20:37:10 +02:00
Dean Herbert
658b6a166f Fix regression in Tracking state handling
It turns out multiple components depend on `Tracking` eventually
becoming `false` at the end of a slider. With my previous changes, this
was no longer the case (as could be seen by the legacy cursor particles
test failure, and heard by slider slide taking too long to stop).
2023-10-04 16:11:40 +09:00
Dean Herbert
d14d885d19 Add test coverage of very fast slider 2023-10-04 14:58:05 +09:00
Dan Balasescu
48209872bf Fix spinner requirements being susceptible to FP precision 2023-10-04 13:53:33 +09:00
Dean Herbert
9361b1879c Add note about early return in DrawableSliderBall.Update 2023-10-04 13:45:26 +09:00
Dean Herbert
8d91991214 Fix difficulty calculation not correct handling slider leniency anymore 2023-10-04 13:45:26 +09:00
Dan Balasescu
854b797ab5
Merge branch 'master' into legacy-tick-not-so-legacy-after-all 2023-10-04 10:52:13 +09:00
Dan Balasescu
a120ea8464
Merge branch 'master' into fix-legacy-score-multipliers-2 2023-10-04 01:19:33 +09:00
Dean Herbert
69ae370e82 Merge branch 'master' into legacy-tick-test-coverage 2023-10-03 19:37:32 +09:00
Dean Herbert
c4992d3479 Fix one case of difficulty calculation no longer accounting for leniency 2023-10-03 19:37:13 +09:00
Dean Herbert
70ec4b060a Rename weird diffcalc parameter name 2023-10-03 19:20:39 +09:00
Dean Herbert
9e1fec0213 Fix potential out-of-order tail and ticks 2023-10-03 18:52:20 +09:00
Dean Herbert
9a3c21c320 Change comparison of timeOffset to greater-than (in line with others)
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-10-03 18:12:55 +09:00
Dean Herbert
0086759395 Fix slider tracking state being set to false after slider end 2023-10-03 18:12:55 +09:00
Dean Herbert
16fcc4eaaa Fix incorrect anchor/origin causing rotation to look wrong on legacy skin arrows 2023-10-03 12:32:52 +09:00
Dean Herbert
3aa51301e8 Add null checks in disposal flow 2023-10-02 22:28:33 +09:00
Dean Herbert
94e49a34fd Adjust legacy reverse arrow implementation to match stable more closely 2023-10-02 22:26:57 +09:00
Dean Herbert
f0070eecf1 Add rotation support for very old skins 2023-10-02 20:09:39 +09:00
Dean Herbert
1bee7bf353 Add note about rotation 2023-10-02 19:22:24 +09:00
Dean Herbert
e4ac8362ec Update other implementations to use non-beat-sync logic 2023-10-02 19:20:11 +09:00
Dean Herbert
8010410487 Stop beat syncing (and close match stable's implementation of arrow animation) 2023-10-02 19:17:35 +09:00
Dean Herbert
ad4e988520 Adjust reverse arrows to bounce more 2023-10-02 18:43:50 +09:00
Dean Herbert
455fc228ad Add edge piece to argon reverse arrow 2023-10-02 18:43:50 +09:00
Dean Herbert
7dd9951c44 Split out reverse arrow implementations to allow better animation 2023-10-02 18:43:50 +09:00
Dan Balasescu
da2a4681d9 Add method to retrieve legacy score multiplier 2023-10-02 16:52:01 +09:00
Dean Herbert
07207ffc32 Fix hitsounds playing too early on fast sliders 2023-10-02 14:09:52 +09:00
Dean Herbert
94f4268ae5 Fix object dim being applied to approach circles
Fixes half of https://github.com/ppy/osu/issues/24956.

The other half is high effort. The number portion is nested deeply and
with reason - depending on skin setting it changes the visual order.

I'm not sure how to fix that one, but I also think it's weird behaviour
and if people don't complain, it's probably fine to just dim the number
for consistency.

That said, the approach circle is an important one to ensure it matches
1:1, so I've fixed that here.
2023-09-29 18:23:23 +09:00
Dean Herbert
dd6d09189e Remove usage of LastTick in osu! ruleset 2023-09-29 16:58:17 +09:00
Dean Herbert
e3695d2be0 Adjust slider judgement logic to allow tracking anywhere after last tick 2023-09-29 16:08:52 +09:00
Dean Herbert
d7119674e8 Update comments to better explain what LastTick is doing 2023-09-29 14:40:44 +09:00
Dean Herbert
81485c548c Move LegacyLastTickOffset specification to generation code and stop passing everywhere 2023-09-29 14:32:29 +09:00
Dean Herbert
c0234ff254 Reduce approach circle's final opacity to match stable
Closes #24941.
2023-09-29 12:44:28 +09:00
Dean Herbert
0a208a5a47
Merge pull request #24932 from smoogipoo/spinner-od-based-max-rpm
Cap maximum spinner RPM based on OD
2023-09-27 15:56:27 +09:00
Dean Herbert
9d8c3f0f5c
Merge pull request #24779 from smoogipoo/split-legacy-scoring-attribs
Split legacy scoring attribs into its own table
2023-09-26 22:35:38 +09:00
Dan Balasescu
05c9f0f9cc Fix bonus requirement not considering number of normal ticks 2023-09-26 18:11:27 +09:00
Dan Balasescu
859155dda1 Cap maximum spinner RPM based on OD 2023-09-26 17:20:20 +09:00
Dean Herbert
990c54519b
Merge branch 'master' into limit-gameplay-sprite-dimensions 2023-09-26 16:40:32 +09:00
Dean Herbert
0dcf7a2fa9
Merge branch 'master' into split-legacy-scoring-attribs 2023-09-26 15:52:27 +09:00
Salman Ahmed
734ee0e68b Simplify code 2023-09-24 02:22:50 +03:00
Fabian van Oeffelt
7c40072c47 Get first Spinner,Slider or HitCircle instead of only HitCircle
Fixes bug
2023-09-23 13:18:49 +02:00
Bartłomiej Dach
69ed99dfd5
Merge branch 'master' into mania-edit-disable-sv 2023-09-21 09:13:27 +02:00
Bartłomiej Dach
28da5baea4
Merge branch 'master' into fix-slider-length 2023-09-20 11:10:01 +02:00
Dean Herbert
41a8239e49 Remvoe null default for mods which can't be null 2023-09-20 15:27:50 +09:00