1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Commit Graph

66737 Commits

Author SHA1 Message Date
Dean Herbert
5ccc745235
Merge pull request #27997 from bdach/refetch-when-entering-editor
Fully refetch working beatmap when entering editor
2024-04-25 22:20:33 +08:00
Dean Herbert
387fcb8781
Add a brief inline comment to make sure we don't undo the fix 2024-04-25 21:31:36 +08:00
Dean Herbert
6a8a6fa79d
Merge pull request #27996 from bdach/delete-dirty-difficulty-droken
Fix deleting modified difficulty via editor leaving user in broken state
2024-04-25 21:20:09 +08:00
Dean Herbert
1756da0dda
Fix redundant string interpolations 2024-04-25 21:14:09 +08:00
Dean Herbert
310ef11eb0
Merge pull request #27995 from bdach/results-nrt
Apply nullability annotations to `ResultsScreen` & inheritors
2024-04-25 20:49:03 +08:00
Bartłomiej Dach
c1107d2797
Fully refetch working beatmap when entering editor
Closes https://github.com/ppy/osu/issues/21794.

I'm not actually super sure as to what the exact mode of failure is
here, but it's 99% to do with working beatmap cache invalidation. Likely
this can be even considered as another case of
https://github.com/ppy/osu/issues/21357, but because this is a one-liner
"fix," I'm PRing it anyways.

The issue is confusing to understand when working with the swap scenario
given in the issue, but it's a little easier to understand when
performing the following:

1. Have a beatmap set with 2 difficulties. Let's call them "A" and "B".
2. From song select, without ever exiting to main menu, edit "A". Change
   the difficulty name to "AA". Save and exit back to song select; do
   not exit out to main menu.
3. From song select, edit "B". Change the difficulty name to "BB". Save
   and exit back to song select.
4. The difficulty names will be "A" and "BB".

Basically what I *think* is causing this, is the fact that even though
editor invalidates the working beatmap by refetching it afresh on exit,
song select is blissfully unaware of this, and continues working with
its own `BeatmapInfo` instances which have backlinks to
`BeatmapSetInfo`.

When editing the first of the two difficulties and then the second,
the editing of the first one only invalidates the first one rather than
the entire set, and the second difficulty continues to have a stale
reference to the first one via the beatmap set, and as such ends up
overwriting the changes from the first save when passed into the editor
and modified again.
2024-04-25 14:31:13 +02:00
Bartłomiej Dach
19d006d818
Fix deleting modified difficulty via editor leaving user in broken state
Closes https://github.com/ppy/osu/issues/22783.

If the difficulty being edited has unsaved changes, the editor exit flow
would prompt for save *after* the deletion method has run. This is
undesirable from a UX standpoint, and also leaves the user in a broken
state.

Thus, just fake an update of the last saved hash of the beatmap to fool
the editor into thinking that it's not dirty, so that the exit flow will
not show a save dialog.
2024-04-25 12:55:34 +02:00
Bartłomiej Dach
d2e9c33b6a
Add failing test case 2024-04-25 12:55:33 +02:00
Bartłomiej Dach
da953b34a7
Apply nullability annotations to ResultsScreen & inheritors 2024-04-25 10:58:28 +02:00
Dean Herbert
6905257869
Merge pull request #27986 from Joehuu/ignore-deployment-target-dropdown
Ignore autogenerated .idea android file
2024-04-25 12:16:15 +08:00
Joseph Madamba
72726809cb Ignore autogenerated .idea android file 2024-04-24 09:47:41 -07:00
Dean Herbert
29a6349fbe
Merge pull request #27982 from Joehuu/chevron-all-context-menus
Add chevron to distinguish all menus with submenus
2024-04-24 22:39:56 +08:00
Joseph Madamba
4f7c9f2970 Remove unused using 2024-04-24 01:00:03 -07:00
Joseph Madamba
5f463b81a8 Remove hardcoded chevrons in test 2024-04-24 00:22:20 -07:00
Joseph Madamba
f97c519451 Add chevron to distinguish all menus with submenus 2024-04-24 00:19:10 -07:00
Dan Balasescu
669b92a8e4
Merge pull request #27978 from peppy/beatmap-attr-text-source
Add ability to show beatmap source using skin editor's beatmap attribute text
2024-04-24 13:57:09 +09:00
Dean Herbert
16fdd4e08d
Add ability to show beatmap source using skin editor's beatmap attribute text
As per https://github.com/ppy/osu/discussions/27955.
2024-04-24 09:01:31 +08:00
Bartłomiej Dach
a35bf77131
Merge pull request #27974 from peppy/editor-menu-chev
Add a chevron to distinguish editor menus with submenus
2024-04-23 18:12:08 +02:00
Bartłomiej Dach
c454dd2496
Merge pull request #27967 from peppy/storyboard-video-transforms-and-sizing
Fix storyboard videos not accepting transforms
2024-04-23 18:09:09 +02:00
Dean Herbert
999c8fdc38
Merge pull request #27969 from bdach/enter-to-confirm-keybinding-conflict
Allow confirming keybinding overwrite on conflict via "select" binding
2024-04-23 23:38:50 +08:00
Dean Herbert
602b16f533
Fix fade-in no longer working on videos 2024-04-23 22:03:32 +08:00
Dean Herbert
a7327a2998
Merge pull request #27972 from bdach/fix-mod-column-stupidity-rfc
Fix mod select overlay columns not displaying properly sometimes
2024-04-23 21:59:29 +08:00
Dean Herbert
436203a8c1
Add a chevron to distinguish editor menus with submenus 2024-04-23 21:37:01 +08:00
Bartłomiej Dach
777081e941
Merge pull request #27973 from peppy/fix-overlay-colour
Fix settings colour scheme wrong when viewing gameplay from skin editor button
2024-04-23 15:22:27 +02:00
Dean Herbert
804b1b0d88
Fix settings colour scheme wrong when viewing gameplay from skin editor button
Closes https://github.com/ppy/osu/issues/27949.
2024-04-23 20:54:48 +08:00
Bartłomiej Dach
f7626aba18
Fix mod select overlay columns not displaying properly sometimes
Closes https://github.com/ppy/osu/issues/26504.

As far as I can tell the issue is basically another manifestation of
https://github.com/ppy/osu-framework/issues/5129, i.e. presence
overrides causing dropped invalidations and thus completely bogus
hierarchy state. The fix is to raise the appropriate invalidation
manually.
2024-04-23 13:36:12 +02:00
Dean Herbert
564dec7a14
Add test coverage of transforms actually being applied to video 2024-04-23 19:21:55 +08:00
Bartłomiej Dach
1e0db1ab9f
Allow confirming keybinding overwrite on conflict via "select" binding 2024-04-23 12:44:16 +02:00
Bartłomiej Dach
a978518a74
Add failing tests 2024-04-23 12:41:33 +02:00
Dean Herbert
17ca29c2c6
Actually apply transforms to the video 2024-04-23 17:37:37 +08:00
Dean Herbert
7eeac0f3b9
Fix incorrect xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-04-23 17:34:52 +08:00
Bartłomiej Dach
12acdeebf1
Merge pull request #27866 from Joehuu/fix-online-score-export
Fix replay export not working correctly from online leaderboards
2024-04-23 09:08:04 +02:00
Bartłomiej Dach
1f010c4bfd
Merge pull request #27808 from smoogipoo/fix-incorrect-pp-counter
Fix gameplay PP counter not matching results screen
2024-04-23 08:43:49 +02:00
Dean Herbert
50afd48812
Add manual test coverage of storyboard videos 2024-04-23 05:21:01 +08:00
Joseph Madamba
49154c0e23 Fix code quality 2024-04-22 11:23:38 -07:00
Joseph Madamba
35eddf35c5 Return Task.CompletedTask instead of null 2024-04-22 11:22:39 -07:00
Joseph Madamba
a59bf6d373 Improve xmldoc wording 2024-04-22 11:17:27 -07:00
Joseph Madamba
2eda56ff08 Revert beatmap query change 2024-04-22 11:15:50 -07:00
Dean Herbert
9e7182acf0
Remove unused DI beatmap paramater 2024-04-22 18:45:02 +08:00
Dean Herbert
c43c383abf
Allow storboard videos to take on no-relative size when specified by a mapper 2024-04-22 18:44:47 +08:00
Dean Herbert
4ae9f81c73
Apply transforms to storyboard videos
This requires that they are a `StoryboardSprite` for simplicity. Luckily
this works just fine.
2024-04-22 18:43:15 +08:00
Bartłomiej Dach
308744348f
Merge pull request #27895 from 64ArthurAraujo/verify-check-incorrect-audio-formats
Add verify checks for incorrect audio formats
2024-04-22 11:10:51 +02:00
Bartłomiej Dach
70a5288a68
Do not attempt to pass files that don't look like audio to BASS 2024-04-22 10:45:09 +02:00
Bartłomiej Dach
b28bf4d2ec
Add test covering non-audio file formats not being checked 2024-04-22 10:43:20 +02:00
Bartłomiej Dach
78f97d0ec7
Merge branch 'master' into verify-check-incorrect-audio-formats 2024-04-22 10:34:14 +02:00
Bartłomiej Dach
ceeb9b0819
Use explicit reference equality check 2024-04-22 10:27:30 +02:00
Bartłomiej Dach
1bcf835d22
Remove redundant array type specification 2024-04-22 10:25:46 +02:00
Dean Herbert
877ca48739
Merge pull request #27964 from smoogipoo/fix-cursormiddle-fallback
Fix `cursormiddle` not using the same source as `cursor`
2024-04-22 16:05:37 +08:00
Arthur Araujo
49563f4e5b Use bitwise to check hitsound formats 2024-04-22 04:44:38 -03:00
Dean Herbert
fb1d20bd39
Comment in some clarification 2024-04-22 15:07:11 +08:00