1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 16:52:55 +08:00
Commit Graph

69280 Commits

Author SHA1 Message Date
Dan Balasescu
fa1da193ff
Merge pull request #28339 from bdach/fix-legacy-body-piece-animation-not-resetting-sometimes
Fix legacy mania note body animation not resetting sometimes
2024-05-29 18:04:39 +09:00
Bartłomiej Dach
22a2adb5e6
Revert unrelated changes 2024-05-29 10:57:30 +02:00
Bartłomiej Dach
9fb7cc5900
Merge branch 'master' into magnetised-judgements 2024-05-29 10:56:53 +02:00
Bartłomiej Dach
bf7dc715de
Merge pull request #28309 from OliBomby/scale-tool
Add precise scaling control to osu! editor
2024-05-29 10:52:00 +02:00
Bartłomiej Dach
84513343d6
Remove unused fields 2024-05-29 10:18:22 +02:00
Bartłomiej Dach
7b7e439d03
Merge branch 'master' into scale-tool 2024-05-29 10:15:48 +02:00
Bartłomiej Dach
9477e3b67d
Change editor scale hotkey to Ctrl-E
Forgot that Ctrl-T was taken by the game-global toolbar already, so it
wasn't working.
2024-05-29 10:14:47 +02:00
Bartłomiej Dach
9bd4b0d613
Rename method 2024-05-29 10:04:51 +02:00
Bartłomiej Dach
ba40737356
Simplify logic 2024-05-29 10:01:04 +02:00
Bartłomiej Dach
96a8bdf920
Use more generic tooltip copy 2024-05-29 09:59:19 +02:00
Bartłomiej Dach
bd5060965f
Simplify toolbox button enable logic 2024-05-29 09:49:16 +02:00
Bartłomiej Dach
4a8273b6ed
Rename another method 2024-05-29 09:43:09 +02:00
Bartłomiej Dach
4c881b5633
Use better name if we're renaming 2024-05-29 09:40:29 +02:00
Aurelian
542809a748 Reduced subpoints limit to be a more practical value 2024-05-29 09:39:46 +02:00
Dan Balasescu
ba3880ad54
Merge pull request #28343 from Hecatia-Lapislazuli/reworked-slider-ball-rotation
Always compute slider ball rotation based on tangent
2024-05-29 14:23:19 +09:00
Dan Balasescu
98ad8f807a
Merge pull request #24138 from tybug/negative-frame-handling
Handle replay frames with negative time delta appropriately
2024-05-29 13:46:24 +09:00
Dan Balasescu
655b0f5343
Merge branch 'master' into negative-frame-handling 2024-05-29 13:14:59 +09:00
Aurelian
b74f66e335 SliderBall's rotation updates based on CurvePositionAt 2024-05-28 19:38:33 +02:00
OliBomby
203e9284eb End circle only gets brighter once shift is held 2024-05-28 19:01:53 +02:00
OliBomby
2261d65b01 Merge remote-tracking branch 'upstream/master' into free-sliders 2024-05-28 18:42:34 +02:00
OliBomby
9a18ba2699 disable playfield centre origin when scaling slider and simplify logic 2024-05-28 18:27:01 +02:00
OliBomby
9548585b15 fix axis checkboxes being disabled in playfield origin scale 2024-05-28 17:24:31 +02:00
OliBomby
d143a697d2 refactor CanScaleFromPlayfieldOrigin and GetClampedScale to derived class 2024-05-28 17:12:16 +02:00
OliBomby
7cdc755c16 Bind axis checkbox disabled state to CanScaleX/Y 2024-05-28 16:57:24 +02:00
Bartłomiej Dach
4828215674
Merge pull request #28338 from peppy/update-framework
Update framework
2024-05-28 16:46:24 +02:00
OliBomby
8eb23f8a60 remove redundant CanScaleFromSelectionOrigin 2024-05-28 16:19:57 +02:00
OliBomby
a89ba33b47 rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled 2024-05-28 16:14:16 +02:00
OliBomby
36453f6215 Change scale hotkey to Ctrl+T 2024-05-28 15:56:59 +02:00
Bartłomiej Dach
bf0040447c
Fix legacy mania note body animation not resetting sometimes
Hopefully closes https://github.com/ppy/osu/issues/28284.

As far as I can tell this is a somewhat difficult one to reproduce
because it relies on a specific set of circumstances (at least the
reproduction case that I found does). The reset to frame 0 would
previously be called explicitly when `isHitting` changed:

    182ca145c7/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs (L144)

However, it can be the case that `bodyAnimation` is not loaded at the
point of this call. This is significant because
`SkinnableTextureAnimation` contains this logic:

    182ca145c7/osu.Game/Skinning/LegacySkinExtensions.cs (L192-L211)

which cannot be moved any earlier (because any earlier the `Clock` may
no longer be correct), and also causes the animation to be seeked
forward while it is stopped.

I can't figure out a decent way to layer this otherwise (by scheduling
or whatever), so this commit is just applying the nuclear option of just
seeking back to frame 0 on every update frame in which the body piece is
not being hit.
2024-05-28 15:29:15 +02:00
Dean Herbert
c2e7cdfdcc
Update framework 2024-05-28 21:29:29 +09:00
Bartłomiej Dach
a3b8493751
Remove rounding of slider velocity multiplier on juice streams
Compare: https://github.com/ppy/osu/pull/26616

This came up elsewhere, namely in
https://github.com/ppy/osu/pull/28277#issuecomment-2133505958.

As it turns out, at least one beatmap among those whose scores had
unexpected changes in total score, namely
https://osu.ppy.sh/beatmapsets/971028#fruits/2062131, was using slider
velocity multipliers that were not a multiple of 0.01 (the specific
value used was 0.225x). This meant that due to the rounding applied to
`SliderVelocityMultiplierBindable` via `Precision`, the raw value was
being incorrectly rounded, resulting in incorrect conversion.

The "direct" change that revealed this is most likely
https://github.com/ppy/osu-framework/pull/6249, by the virtue of
shuffling the `BindableNumber` rounding code around and accidentally
changing midpoint rounding semantics in the process. But it was not
at fault here, as rounding was just as wrong before that change
as after in this specific context.
2024-05-28 13:14:44 +02:00
Bartłomiej Dach
96af0e1ec3
Add failing test case for catch conversion
Test is an abridged / cropped version of
https://osu.ppy.sh/beatmapsets/971028#fruits/2062131 to demonstrate
the specific failure case (unfortunately can't use the whole beatmap
due to other conversion failures).
2024-05-28 13:13:17 +02:00
Dean Herbert
8c4931eeec
Merge branch 'master' into footer-v2-transitions 2024-05-28 18:49:39 +09:00
Dean Herbert
182ca145c7
Merge pull request #28183 from frenzibyte/footer-v2-back-button
Add new footer back button and fix shearing being different between components
2024-05-28 18:49:24 +09:00
Dean Herbert
4408039b3e
Merge branch 'master' into footer-v2-back-button 2024-05-28 15:50:34 +09:00
Dan Balasescu
e2b4e25ffa
Merge pull request #28277 from bdach/total-score-without-mods-once-more
Compute total score without mods during standardised score conversion
2024-05-28 07:49:27 +09:00
Aurelian
6c4def1c09 Added check for infinite subpoints for PerfectCurve 2024-05-27 20:32:18 +02:00
Aurelian
172cfdf88d Added missing brackets for formulas 2024-05-27 19:41:38 +02:00
Aurelian
d81be56adf Test for accuracy of perfect curves 2024-05-27 19:35:33 +02:00
Bartłomiej Dach
daee363743
Merge branch 'master' into total-score-without-mods-once-more 2024-05-27 15:16:58 +02:00
Bartłomiej Dach
c6c66fbd01
Merge pull request #28333 from peppy/preview-playlist-items
Allow previewing audio of playlist items
2024-05-27 14:22:49 +02:00
Bartłomiej Dach
405c72c0d6
Fix mod display not being aligned with mapper text 2024-05-27 13:36:44 +02:00
Dean Herbert
aad0982e26
Adjust size of play button / progress to match BeatmapCardThumbnail usage 2024-05-27 20:33:24 +09:00
Dean Herbert
75d961e6f2
Pass the same thing in twice for better maybe 2024-05-27 20:30:01 +09:00
Dean Herbert
d976224912
Standardise padding on both sides of difficulty icon 2024-05-27 19:59:25 +09:00
Bartłomiej Dach
1f41261fc7
Fix test failure 2024-05-27 12:01:02 +02:00
Bartłomiej Dach
1e2cac3e92
Remove unused using directive 2024-05-27 11:44:55 +02:00
Dean Herbert
740a3377fa
Merge branch 'master' into LeaderBoardScore_clean 2024-05-27 17:18:41 +09:00
Dean Herbert
b6471f0b9c
Allow previewing audio of playlist items 2024-05-27 17:09:37 +09:00
Bartłomiej Dach
525663fc27
Merge pull request #28332 from peppy/cinema-mod-overlay-hiding
Fix cinema mod not hiding playfield skin layer
2024-05-27 08:48:10 +02:00