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

67253 Commits

Author SHA1 Message Date
Dean Herbert
fdb47f8dfa
Fix incorrect handling of nested objects when inside parent object's duration 2024-05-29 23:30:47 +09:00
Dean Herbert
126837fadd
Apply results rather than fake a replay frame 2024-05-29 23:28:37 +09:00
Dean Herbert
3b5b7b2f88
Fix the majority of cases where gameplay stil doesn't end due to judgement count mismatch 2024-05-29 22:57:17 +09:00
Dean Herbert
d2c86b0813
Avoid passing beatmap in from editor when it's already present 2024-05-29 21:32:55 +09:00
Dean Herbert
16e2fa2c6a
Merge branch 'master' into fix/editor-test-exit 2024-05-29 21:08:36 +09:00
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
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
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
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
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
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
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
Bartłomiej Dach
d22b72a75c
Merge branch 'master' into cinema-mod-overlay-hiding 2024-05-27 08:27:28 +02:00
Bartłomiej Dach
bdfce4b9da
Fix xmldoc reference 2024-05-27 08:26:00 +02:00
Dean Herbert
5aa537f0c8
Merge pull request #28311 from Joppe27/taiko-glow-scale
Correct scale of `taiko-glow` element to match stable
2024-05-27 15:19:06 +09:00
Bartłomiej Dach
0aec8da102
Merge pull request #28327 from peppy/windows-16px-icon
Revert windows 16px icon to original version
2024-05-27 08:18:41 +02:00
Dean Herbert
11c3d11db9
Fix cinema mod not hiding playfield skin layer 2024-05-27 14:52:28 +09:00
Dean Herbert
0d6adf160b
Share scale factor with hit target 2024-05-27 14:20:28 +09:00
Dean Herbert
a62b9fa633
Revert windows 16px icon to original version
This also fixes the 48px version looking uncanny due to smaller paddings.
2024-05-27 11:42:36 +09:00