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

5455 Commits

Author SHA1 Message Date
Salman Ahmed
eaa748f075 Remove unused using directive 2024-01-17 18:35:34 +03:00
Salman Ahmed
ed1e66b8f9 Fix enabling beatmap skin cause hitobjects to use LegacyApproachCircle regardless of selected skin 2024-01-17 16:36:09 +03:00
Salman Ahmed
e54d20ea93 Remove ancient osu-resources lookup path from legacy skin textures 2024-01-17 16:33:14 +03:00
Bartłomiej Dach
d0e9402761
Fix flashlight not dimming if slider head is hit early
Closes https://github.com/ppy/osu/issues/26551

Fix is a bit nuclear (`OnUpdate` should be considered last resort),
but I don't see many better alternatives here as
`ApplyCustomUpdateState` does not work...
2024-01-16 18:56:50 +01:00
Justin
7736445659
Merge branch 'master' into spinner-speed-fix 2024-01-17 01:40:53 +11:00
Dean Herbert
c45daa373e
Fix cursor scale animation not matching stable on classic skins 2024-01-16 17:15:25 +09:00
Justin
e3ab7b1e9f Update disctop to use turnratio like stable 2024-01-16 17:22:22 +11:00
Dean Herbert
2fdbc501c2
Merge pull request #26499 from OliBomby/slider-performance
Fix lag when dragging first slider control point in editor
2024-01-16 13:22:49 +09:00
Bartłomiej Dach
71d0543213
Merge pull request #26545 from frenzibyte/fix-resume-cursor-transition-abused
Fix pop-in scale transition in resume overlay affecting input area
2024-01-15 20:06:16 +01:00
Dean Herbert
23815b2045
Merge pull request #26547 from bdach/cursor-ripple-pool-wrong
Fix cursor ripple pool not loading pooled drawables ahead of time
2024-01-15 22:56:50 +09:00
Bartłomiej Dach
399fc8195a
Fix cursor ripple pool not loading pooled drawables ahead of time
Increment the counter over at
https://github.com/ppy/osu-framework/pull/6136.
2024-01-15 13:22:22 +01:00
OliBomby
96ffe8e737 change wording 2024-01-15 12:51:08 +01:00
Dean Herbert
6b844ed8b6
Split out judgement pooling concepts from OsuPlayfield for reuse 2024-01-15 20:50:09 +09:00
OliBomby
86382f4408 Clarify comment 2024-01-15 12:49:40 +01:00
Salman Ahmed
13517869f6 Apply scale transitions in resume overlay cursor to local container 2024-01-15 14:03:23 +03:00
Dean Herbert
6c0e968727
Merge pull request #26512 from OliBomby/slider-pathtype-update
Fix glitchy path type correction for sliders in the editor
2024-01-15 16:19:24 +09:00
Bartłomiej Dach
0b2b1fc588
Fix flashlight dim being applied before slider start time
Closes https://github.com/ppy/osu/issues/26515.

Compare https://github.com/ppy/osu/pull/26053.
2024-01-14 13:05:02 +01:00
OliBomby
243b7b6fda fix code quality 2024-01-13 23:17:38 +01:00
OliBomby
83e108071a fix wrong path type being displayed 2024-01-13 22:51:33 +01:00
OliBomby
39908f5425 remove Validating event and instead call validation explicitly on edits 2024-01-13 22:39:09 +01:00
OliBomby
da4d83f8ca remove the need for caching points in segment 2024-01-13 21:41:33 +01:00
OliBomby
b4f9878b46 working jank solution 2024-01-13 20:39:49 +01:00
OliBomby
f5d6d52d4c Move logic for caching segments and updating path types to PathControlPointVisualiser 2024-01-13 14:47:40 +01:00
OliBomby
ce643aa68f revert overwriting Position getter in SliderTailCircle
It would have very weird implications when combined with the position bindable which would be all wrong and stuff
2024-01-13 13:54:04 +01:00
OliBomby
fca9b1f536 Fix so it reacts to PathVersion with Scheduler 2024-01-13 12:50:39 +01:00
OliBomby
e1186080b8 simplify scheduling logic 2024-01-13 02:24:33 +01:00
OliBomby
5fa7f6ec53 make drawables that update from path version update once per frame 2024-01-13 02:21:32 +01:00
OliBomby
882f490390 lazy load slider tail position 2024-01-13 01:32:37 +01:00
Bartłomiej Dach
7c9adc7ad3
Fix incorrect score conversion on selected beatmaps due to incorrect difficultyPeppyStars rounding
Fixes issue that occurs on *about* 246 beatmaps and was first described
by me on discord:

    https://discord.com/channels/188630481301012481/188630652340404224/1154367700378865715

and then rediscovered again during work on
https://github.com/ppy/osu/pull/26405:

    https://gist.github.com/bdach/414d5289f65b0399fa8f9732245a4f7c#venenog-on-ultmate-end-by-blacky-overdose-631

It so happens that in stable, due to .NET Framework internals, float
math would be performed using x87 registers and opcodes.
.NET (Core) however uses SSE instructions on 32- and 64-bit words.
x87 registers are _80 bits_ wide. Which is notably wider than _both_
float and double. Therefore, on a significant number of beatmaps,
the rounding would not produce correct values due to insufficient
precision.

See following gist for corroboration of the above:

    https://gist.github.com/bdach/dcde58d5a3607b0408faa3aa2b67bf10

Thus, to crudely - but, seemingly accurately, after checking across
all ranked maps - emulate this, use `decimal`, which is slow, but has
bigger precision than `double`. The single known exception beatmap
in whose case this results in an incorrect result is

    https://osu.ppy.sh/beatmapsets/1156087#osu/2625853

which is considered an "acceptable casualty" of sorts.

Doing this requires some fooling of the compiler / runtime (see second
inline comment in new method). To corroborate that this is required,
you can try the following code snippet:

    Console.WriteLine(string.Join(' ', BitConverter.GetBytes(1.3f).Select(x => x.ToString("X2"))));
    Console.WriteLine(string.Join(' ', BitConverter.GetBytes(1.3).Select(x => x.ToString("X2"))));
    Console.WriteLine();

    decimal d1 = (decimal)1.3f;
    decimal d2 = (decimal)1.3;
    decimal d3 = (decimal)(double)1.3f;

    Console.WriteLine(string.Join(' ', decimal.GetBits(d1).SelectMany(BitConverter.GetBytes).Select(x => x.ToString("X2"))));
    Console.WriteLine(string.Join(' ', decimal.GetBits(d2).SelectMany(BitConverter.GetBytes).Select(x => x.ToString("X2"))));
    Console.WriteLine(string.Join(' ', decimal.GetBits(d3).SelectMany(BitConverter.GetBytes).Select(x => x.ToString("X2"))));

which will print

    66 66 A6 3F
    CD CC CC CC CC CC F4 3F

    0D 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00
    0D 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00
    8C 5D 89 FB 3B 76 00 00 00 00 00 00 00 00 0E 00

Note that despite `d1` being converted from a less-precise floating-
-point value than `d2`, it still is represented 100% accurately as
a decimal number.

After applying this change, recomputation of legacy scoring attributes
for *all* rulesets will be required.
2024-01-10 19:30:18 +01:00
Dean Herbert
5970a68e2d
Use invalidation based logic for child anchor position updpates in DrawableSlider 2024-01-09 14:17:33 +09:00
Dean Herbert
962c8ba4ac
Reset child anchor position cache on hitobject position change 2024-01-07 20:55:28 +09:00
Dean Herbert
5cc4a586ac
Avoid iteration over NestedHitObjects in silder's Update unless necessary 2024-01-07 14:31:22 +09:00
Dean Herbert
35eff639cb
Remove unnecessary second iteration over NestedHitObjects 2024-01-07 14:31:22 +09:00
Dean Herbert
ddc8a64764
Reduce spinner glow
It was horrible
2024-01-04 14:55:52 +09:00
Dean Herbert
94531807e4
Make slider ends show on results screen again 2024-01-02 17:01:32 +09:00
Dan Balasescu
17a531209c
Use SliderTailHit result for slider tails (non-classic-mod) 2023-12-30 10:38:47 +09:00
Dean Herbert
c7f10dbc74
Merge pull request #26148 from rushiiMachine/resumeoverlay-min-cursor-size
Force minimum cursor size for `OsuResumeOverlay`
2023-12-28 19:23:57 +09:00
rushiiMachine
cf39bb7a18
Fix spinner max bonus not respecting ISamplePlaybackDisabler
The spinner max bonus was loaded through SkinnableSound instead of PausableSkinnableSound, leading to it not respecting the case where sample playback is globally disabled through ISamplePlaybackDisabler, and can be easily heard in situations like during the catchup period after seeking using the ArgonSongProgressBar with song volume at 0
2023-12-27 12:55:49 -08:00
Bartłomiej Dach
288ac930e4
Use new icons in editor
Some that exist on figma are purposefully not used due to an editorial
request from @peppy.
2023-12-27 17:42:18 +01:00
rushiiMachine
c087578e01
Force minimum cursor size for OsuResumeOverlay
On cursor sizes below 0.3x it becomes exceedingly difficult to quickly locate and then accurately click the resume cursor on the pause overlay as it could as big as a handful of pixels. This clamps the minimum cursor size to 1x for the resume overlay, which is way more comfortable and more closely resembles stable.
2023-12-26 10:07:21 -08:00
Bartłomiej Dach
651a608e73
Merge pull request #26120 from peppy/argon-triangle-tick-end-miss
Update argon and triangles slider tick/end miss to match display style
2023-12-25 14:42:59 +01:00
Dean Herbert
8e6ea2dd9b
Update argon and triangles to match display style 2023-12-25 17:37:28 +09:00
Andrei Zavatski
19d0236418 Change mod acronym 2023-12-23 22:11:00 +03:00
Andrei Zavatski
e470a42da0 Merge branch 'master' into depth-mod 2023-12-23 22:09:12 +03:00
Dean Herbert
d72ec81684
Merge pull request #26083 from smoogipoo/try-improve-hp-drain
Replace recently-added HP drain density calculation with combo-end bonus
2023-12-24 01:30:49 +09:00
Dan Balasescu
7437d21f49
Adjust comment regarding slider tail 2023-12-24 00:45:22 +09:00
Dan Balasescu
8b11bcc6ea
Remove unused using 2023-12-24 00:08:15 +09:00
Dan Balasescu
00090bc527
Add combo end bonus to HP 2023-12-23 23:51:12 +09:00
Dan Balasescu
d1000b2e6c
remove HP density 2023-12-23 23:36:15 +09:00
Dean Herbert
c5893f245c
Change legacy version checks to account for users specifying incorrect versions 2023-12-23 14:03:45 +09:00
Dean Herbert
21e9e103fd
Merge pull request #26039 from smoogipoo/hp-drain-density
Add basic density consideration to HP drain
2023-12-23 01:04:53 +09:00
Dean Herbert
32e1b273c2
Merge pull request #26053 from bdach/fix-strict-tracking-sliders
Fix strict tracking mod forcefully missing tail before slider start time
2023-12-23 00:03:47 +09:00
Bartłomiej Dach
30553dc7b8
Fix strict tracking mod forcefully missing tail before slider start time
Closes https://github.com/ppy/osu/issues/25816.

Regressed in https://github.com/ppy/osu/pull/25748.

The reason this broke is that allowing the state of `Tracking` to change
before the slider's start time to support the early hit scenario causes
strict tracking to consider loss of tracking before the slider's start
time as an actual miss, and thus forcefully miss the tail
(see test case in 6cb8231054).
2023-12-22 13:43:14 +01:00
Bartłomiej Dach
7e557152fb
Fix relax mod not considering full follow area radius when automatically holding sliders
Closes https://github.com/ppy/osu/issues/25947.

Regressed in https://github.com/ppy/osu/pull/25776 with the changes to
`DrawableSliderBall`.

I would have liked to include tests, but relax mod is a bit untestable,
because it disengages completely in the presence of a replay:

	7e09164d70/osu.Game.Rulesets.Osu/Mods/OsuModRelax.cs (L49-L58)

Additionally, `RulesetInputManager` disengages completely from parent
inputs when there is a replay active:

	7e09164d70/osu.Game/Rulesets/UI/RulesetInputManager.cs (L116)

which means there is really no easy way to control positional input
while still having relax logic work. So I'm hoping the fix could be
considered obvious enough to not require test coverage.
2023-12-22 12:50:42 +01:00
Dan Balasescu
a0185508b7
Add basic consideration of density for HP drain 2023-12-22 18:08:26 +09:00
Dan Balasescu
3f6dad5502
Use classic HP values for non-classic osu! HP drain 2023-12-22 02:16:46 +09:00
Dan Balasescu
6b4b2a57fc
Expose only as one method 2023-12-21 14:58:23 +09:00
Dan Balasescu
4e3b994142
Relocate HitResult numeric score to ScoreProcessor 2023-12-21 14:52:31 +09:00
Dean Herbert
fa4c9051cb
Merge branch 'master' into argon-pro-no-slider-tick-judgements 2023-12-21 10:01:22 +09:00
Bartłomiej Dach
88e36eb08c
Fix autopilot mod still declaring incompatibility with fail-preventing mods
Closes https://github.com/ppy/osu/issues/25974.
2023-12-20 21:46:18 +01:00
Bartłomiej Dach
b6a331b2f7
Fix argon pro not showing slider tick judgements
Addresses https://github.com/ppy/osu/discussions/25968.
2023-12-20 20:52:26 +01:00
Dean Herbert
eb8fb8092d
Attempt to standardise miss handling logic 2023-12-21 00:59:35 +09:00
Dean Herbert
fcf47267fd
Revert change to OsuHitWindows and move logic local to pooling initialisation 2023-12-21 00:48:46 +09:00
Dean Herbert
9b383e3276
Add support for showing tick misses 2023-12-20 20:23:19 +09:00
Dean Herbert
b6f0c98a09
Also apply to autopilot 2023-12-20 14:56:52 +09:00
Dan Balasescu
fe5e071e70
Fix sliding sample playing before Slider's start time 2023-12-19 17:01:52 +09:00
Dean Herbert
2f28a92f0a
Merge pull request #25776 from smoogipoo/slider-late-hit-lenience
Add slider head circle late hit lenience
2023-12-18 13:05:31 +09:00
Dan Balasescu
2b33aec124
Require slider head to be judged before ticks 2023-12-17 21:26:48 +09:00
Dan Balasescu
fddfa33e49
Fix 1-frame issues due to referencing external value 2023-12-17 20:19:25 +09:00
Dan Balasescu
9b02bd712b
Only track if in slider ball after any ticks missed 2023-12-17 20:12:02 +09:00
Dan Balasescu
fbe48d7be8
Fix tail being missed too early 2023-12-17 20:11:15 +09:00
Dan Balasescu
f77884b62f
Only hit passed-through ticks if none were missed 2023-12-17 19:57:48 +09:00
Dan Balasescu
4b9aefa6f2
Change osu ruleset to use new HP algorithm by default 2023-12-17 19:33:04 +09:00
Dean Herbert
c0e96927aa
Merge branch 'master' into slider-late-hit-lenience 2023-12-17 13:00:01 +09:00
Dan Balasescu
12210017e4
Use the cursor position to test nested object validity 2023-12-15 17:05:14 +09:00
Dan Balasescu
6bd190c55d
Refactor all slider input into SliderInputManager 2023-12-15 16:13:32 +09:00
Dan Balasescu
599fdb0128
Add lenience for late-hit of slider heads 2023-12-15 14:14:58 +09:00
Bartłomiej Dach
0f4d054bfe
Use HitWindows data directly for computing effective OD 2023-12-14 20:41:12 +01:00
Bartłomiej Dach
605269f65f
Extract preempt durations to shared constants 2023-12-14 20:41:12 +01:00
Bartłomiej Dach
fd1c72bf74
Use IBeatmapDifficultyInfo.(Inverse)DifficultyRange() instead of local reimplementations
Also adds explicit references to places from where the magic constants
were lifted.
2023-12-14 20:41:12 +01:00
Dean Herbert
33d3766918
Merge pull request #25748 from smoogipoo/slider-early-hit-lenience
Allow sliders to track if hit early
2023-12-14 16:40:12 +09:00
Dan Balasescu
27e55def64
Make animation start at the slider's start time 2023-12-13 20:27:14 +09:00
Dean Herbert
9a982a9564
Tidy up GetRateAdjustedDisplayDifficulty implemetations 2023-12-13 17:13:21 +09:00
Dan Balasescu
3f67538d61
Allow slider to be tracked before its start time 2023-12-13 16:59:41 +09:00
Dean Herbert
0259ab761b
Merge branch 'master' into arod_rate_adjust 2023-12-13 16:35:18 +09:00
Dean Herbert
c2d3dcdd9c
Fix slider tests and incorrect nullability handling around freehandToolboxGroup 2023-12-13 15:15:49 +09:00
Dean Herbert
73189be6cc
Merge branch 'better-drawing' into dropdown-search 2023-12-13 14:09:33 +09:00
Dean Herbert
5b00cf283d
Merge branch 'master' into drawnode-subtree-draw-cleanup 2023-12-13 14:01:01 +09:00
Dan Balasescu
987fe9322e
Merge pull request #24166 from Zyfarok/scorev3
Modify osu! standardised scoring to introduce a combo exponent
2023-12-12 17:38:44 +09:00
Givikap120
faf54bca43
Merge branch 'master' into arod_rate_adjust 2023-12-10 01:49:18 +02:00
Dan Balasescu
005fb78994
Fix last tick handling in osu beatmap conversion tests 2023-12-07 16:02:00 +09:00
OliBomby
7b49db05d1 Update default parameters to be slightly better 2023-12-07 01:15:42 +01:00
OliBomby
a2ec75d824 Fix illegal circle arc with center out of polygon 2023-12-07 00:57:29 +01:00
OliBomby
89859b85b7 add controllable leniency 2023-12-07 00:43:34 +01:00
OliBomby
1930476192 Add circle arc segments 2023-12-07 00:26:13 +01:00
OliBomby
22287f3a7f decrease max tolerance 2023-12-06 16:36:24 +01:00
OliBomby
a8f3a0533a Use 4th order BSpline by default 2023-12-06 16:35:59 +01:00
Andrei Zavatski
b0878e36cf Fix stacks having incorrect position 2023-12-06 10:30:21 +03:00
Andrei Zavatski
160edcd270 Move objects at a constant speed whenever possible 2023-12-06 08:42:34 +03:00
Andrei Zavatski
594ea4da5f Apply suggested behaviour 2023-12-05 16:00:20 +03:00