1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 09:22:54 +08:00
Commit Graph

60926 Commits

Author SHA1 Message Date
Cootz
54f864463c
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 13:54:47 +03:00
cdwcgt
d025c441ca delay mod save after click save or not popover hidden 2023-03-16 19:48:45 +09:00
Dean Herbert
cb9b14b30f Revert "Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending"
This reverts commit 15c44a2817, reversing
changes made to de2ab05e78.
2023-03-16 19:48:36 +09:00
cdwcgt
42bcc8bafc revert mod store 2023-03-16 19:38:15 +09:00
Cootz
556964eae0
Merge branch 'master' into BitmapUpdatesOnScore 2023-03-16 12:16:42 +03:00
Dean Herbert
3b62f87b64 Ensure Player does not fail a score on exit if a replay is currently loaded 2023-03-16 17:14:20 +09:00
Dean Herbert
a81408ca06 Add failing test coverage showing that replay will fail on exiting gameplay 2023-03-16 17:12:46 +09:00
Dean Herbert
15c44a2817
Merge pull request #22741 from cdwcgt/do-not-fetch-deletePending
Don't fetch `beatmapset` that already `PendingDelete` when import score
2023-03-16 16:37:18 +09:00
Dean Herbert
cd102da3af Move matches string inside text box 2023-03-16 16:34:31 +09:00
Dean Herbert
8e6a4559e3 Add xmldoc for new method and reorder methods in SkinReloadableDrawable 2023-03-16 15:58:42 +09:00
Dean Herbert
159c8833c7 Add test coverage of SkinnableSound not updating in time when not present 2023-03-16 15:41:05 +09:00
Dean Herbert
297e7d6542 Fix Flush call being run too late in PoolableSkinnableSample 2023-03-16 15:33:30 +09:00
Dean Herbert
5378cdff20 Apply NRT to TestSceneSkinnableSound 2023-03-16 15:10:35 +09:00
Dean Herbert
89b42ddd98 Don't localise beatmap count string for now 2023-03-16 15:02:38 +09:00
Dean Herbert
7b34607676 Merge branch 'master' into bubble_mod_implementation_clean 2023-03-16 13:45:22 +09:00
Terochi
edc6314634 Drank some coffee and figured out the fix 2023-03-15 10:49:59 +01:00
Dean Herbert
5f9b13a775 Rename Add/AddRange methods as they are no longer conflicting with Container 2023-03-15 18:02:41 +09:00
Dean Herbert
9e444af380 Use object initialisers and fix order of initialisation vs add 2023-03-15 18:02:26 +09:00
Dean Herbert
8908648f97 Fix super-dodgy cast of IEnumerable to Drawable 2023-03-15 18:01:22 +09:00
Dean Herbert
d87f0557ce Update colours for 3k to not use double-purples 2023-03-15 17:18:45 +09:00
Terochi
b0f1a69523 Update the pauseLoop sample instantly on skin change 2023-03-15 09:05:34 +01:00
Terochi
a9c349fa6d Cache any skin changes in SkinReloadableDrawable to ScheduledDelegate 2023-03-15 09:03:29 +01:00
Dean Herbert
de2ab05e78
Merge pull request #22765 from Joehuu/fix-overlay-sidebar-scroll
Fix overlay sidebars not scrolling to end due to parent scroll view
2023-03-15 16:52:59 +09:00
Dean Herbert
42359a9754 Fix previous touch action not being released when it's not a direct touch 2023-03-15 16:43:20 +09:00
Dean Herbert
6c4f596a9a Make osu! touch input aware of the distance travelled of a non-direct touch 2023-03-15 16:43:20 +09:00
Dean Herbert
0a19b1e9cf
Merge pull request #22860 from rozukke/fix-skin-ini-import
Fix import of skins with non-ASCII names that have been previously exported by lazer
2023-03-15 15:36:51 +09:00
Dean Herbert
f8e773ab8e
Merge branch 'master' into fix-overlay-sidebar-scroll 2023-03-15 15:30:50 +09:00
Dean Herbert
1cf870d956 Add test coverage and fix fail case where a drag selection ends incorrectly with cyclic selection 2023-03-15 15:16:48 +09:00
Terochi
390ad335d0 Reloading samples before playing then when skin change occurs 2023-03-14 21:35:52 +01:00
Terochi
1d5e596615 Update FailAnimation to use SkinnableSound 2023-03-14 20:44:30 +01:00
Dean Herbert
f91af8fa64
Merge pull request #22750 from smoogipoo/veldrid-renderer
Update graphic code in line with framework renderer changes
2023-03-15 00:29:54 +09:00
Dean Herbert
3c4e2d8700 Add tests covering drag selection 2023-03-14 21:04:51 +09:00
Dean Herbert
6546f5968a Merge branch 'master' into skin-editor-cyclic-selection 2023-03-14 20:43:56 +09:00
Dean Herbert
b46fc14e56
Merge pull request #22848 from Rovearix/Fix-Dragging-Preventing-Beatmap-Loading
Prevent LoadingLayer from blocking loading
2023-03-14 20:42:10 +09:00
Dean Herbert
b5ea855b6c Fix failing DrawableRulesetDependencies test 2023-03-14 20:37:50 +09:00
Dean Herbert
d65d09e45f Change field to const 2023-03-14 20:24:39 +09:00
Dean Herbert
8fd07b51f7
Merge pull request #22842 from LumpBloom7/Fix-argon-progress-bar-oversized-fill
Fix argon progress bar fill being oversized
2023-03-14 18:46:25 +09:00
Dean Herbert
4cea29402b Don't show epilepsy warning when storyboards are disabled
I have more thoughts on this warning in general (which will likely see
it removed or moved in the future) but this seems like a quick QOL fix
for now.

As mentioned in https://github.com/ppy/osu/discussions/22861.
2023-03-14 18:32:26 +09:00
Dean Herbert
5aebbac6c5 Fix osu!mania hold note animations not correctly re-applying after rewind
There's early exit logic in `OnPressed`/`OnReleased` for the sake of
keeping order correct, but this doesn't account for the fact that
`DrawableHitObject` resets all animations when the hit state changes.

A bit of an ugly workaround, but seems to work as expected.
2023-03-14 18:15:19 +09:00
Dean Herbert
f40a4b591f Adjust animation length and colouring of hitting layer 2023-03-14 18:14:29 +09:00
Dean Herbert
0b23809585 Update resources 2023-03-14 17:52:17 +09:00
Dean Herbert
48d11610b3 Update framework 2023-03-14 17:44:51 +09:00
Dean Herbert
969c0e9c9d Merge branch 'master' into veldrid-renderer 2023-03-14 17:35:38 +09:00
Dean Herbert
300d81c46b Add hitting layer to fix hit lighting not being applied to tail piece
Taken from https://github.com/ppy/osu/pull/22820#issuecomment-1462626898.
2023-03-14 17:29:19 +09:00
rozukke
4570c0030f Add test to check for import of exported skin with non-ASCII name 2023-03-13 23:37:45 +11:00
Rovearix
9ac9287dbd Switched the implementation to set the blockInput flag for the BeatmapMetadataDisplay's LoadingLayer. This prevents the UIEvents from being being handled in this case without modifying the class 2023-03-13 08:07:55 -04:00
Rovearix
ba728bdab1 Changed the event to be the more correct one to block 2023-03-13 07:49:51 -04:00
rozukke
1f7721786b Perform check to account for non-ASCII characters 2023-03-13 22:01:26 +11:00
Dean Herbert
da947d8661 Gracefully handle beatmaps specifying images using the video storyboard type 2023-03-13 18:24:16 +09:00
Dean Herbert
eb37d740b1 Update supported video filetypes to match osu-stable 2023-03-13 18:24:16 +09:00