1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-31 13:33:20 +08:00
Commit Graph

3231 Commits

Author SHA1 Message Date
Dean Herbert
10ee2e28c2
Merge pull request #31303 from bdach/pause-on-gameplay-test
Pause playback when entering gameplay test from editor
2024-12-28 04:41:28 +09:00
Dean Herbert
1b2a223a5f
Fix failing test scene due to new dependency 2024-12-28 01:02:15 +09:00
Bartłomiej Dach
6a6db5a22b
Populate metadata from ID3 tags when changing beatmap audio track in editor
- Closes https://github.com/ppy/osu/issues/21189
- Supersedes / closes https://github.com/ppy/osu-framework/pull/5627
- Supersedes / closes https://github.com/ppy/osu/pull/22235

The reason why I opted for a complete rewrite rather than a revival of
that aforementioned pull series is that it always felt quite gross to me
to be pulling framework's audio subsystem into the task of reading ID3
tags, and I also partially don't believe that BASS is *good* at reading
ID3 tags. Meanwhile, we already have another library pulled in that is
*explicitly* intended for reading multimedia metadata, and using it
does not require framework changes. (And it was pulled in explicitly for
use in the editor verify tab as well.)

The hard and dumb part of this diff is hacking the gibson such that
the metadata section on setup screen actually *updates itself*
after the resources section is done doing its thing. After significant
gnashing of teeth I just did the bare minimum to make work by caching
a common parent and exposing an `Action?` on it. If anyone has better
ideas, I'm all ears.
2024-12-27 15:16:03 +01:00
Bartłomiej Dach
5abad07412
Pause playback when entering gameplay test from editor
Closes https://github.com/ppy/osu/issues/31290.

Tend to agree that this is a good idea for gameplay test at least. Not
sure about other similar interactions like exiting - I don't think it
matters what's done in those cases, because for exiting timing is in no
way key, so I just applied this locally to gameplay test.
2024-12-27 09:08:16 +01:00
Bartłomiej Dach
9652c5a7ca
Merge pull request #31110 from peppy/timing-current-point-indicator
Change the way "current" points are hinted on timing screen
2024-12-16 13:27:06 +09:00
Bartłomiej Dach
1058abb4ab
Fix code quality 2024-12-16 12:22:06 +09:00
Dean Herbert
da840e3fac
Change the way "current" points are hinted on timing screen
I actually thought things were bugged with the previous display method,
since the hinting was very similar to the hover colour/state.

I've adjusted this to hopefully give users a better idea of what this is
intending to show them.
2024-12-13 19:45:18 +09:00
Dean Herbert
64555debc2
Fix adjusting control point offset after undo/redo causing catastrophic failure
Closes https://github.com/ppy/osu/issues/31098.

Low effort fix because it was already half broken. The test was testing
in isolation but in actual editor usage it wasn't working as expected.
2024-12-13 19:33:51 +09:00
Dean Herbert
2a4f596f90
Merge branch 'master' into ios-beatmap-export 2024-12-10 23:59:15 -08:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Dean Herbert
bbaa542d4a
Add note about expensive operation 2024-12-10 16:45:26 +09:00
Dean Herbert
3cac583754
Rewrite resource changing code to be more legible (to my eye) 2024-12-10 16:45:26 +09:00
Dean Herbert
7ec2d91e14
Merge branch 'master' into editor-multiple-background-audio-files 2024-12-10 14:19:55 +09:00
Salman Alshamrani
e9868c6318 Enable exporting beatmaps in iOS 2024-12-09 07:47:28 -05:00
Bartłomiej Dach
459533aba6
Merge branch 'master' into bookmarks 2024-12-07 22:22:04 +09:00
Dean Herbert
8d0e1f9d18
Merge branch 'master' into improve-menu-sample-playback 2024-12-05 21:07:03 +09:00
Salman Alshamrani
8e0f6fc12d Re-encode difficulties on resource change 2024-12-04 04:36:00 -05:00
Salman Alshamrani
60d91bada8 Merge branch 'master' into editor-multiple-background-audio-files 2024-12-04 04:31:15 -05:00
Bartłomiej Dach
d60b7f4798
Implement basic bookmark support in editor 2024-12-03 15:14:22 +01:00
Bartłomiej Dach
808934581f
Move bookmarks out of BeatmapInfo
Not sure why I didn't do that in https://github.com/ppy/osu/pull/28473...
2024-12-03 14:17:14 +01:00
Bartłomiej Dach
b505ecc7ba
Do not deselect objects when control-clicking without hitting anything
As per feedback in
https://discord.com/channels/90072389919997952/1259818301517725707/1310270647187935284.
2024-12-02 13:51:43 +01:00
Bartłomiej Dach
6c0ccc5ebe
Merge pull request #30863 from frenzibyte/improve-back-button-display
Delay back button appearance when performing a quick restart
2024-12-02 11:49:45 +01:00
Dean Herbert
5b2558cec2
Merge pull request #28473 from bdach/beatmap-info-purge
Move unnecessary properties from `BeatmapInfo` / realm to `IBeatmap`
2024-12-02 16:19:12 +09:00
Bartłomiej Dach
5f092811cb
Use helper in one more place 2024-11-29 09:22:29 +01:00
Bartłomiej Dach
5a9127dfc6
Accidentally a word 2024-11-29 08:46:08 +01:00
Bartłomiej Dach
110e4fbb30
Centralise supported file extensions to one helper class
As proposed in
https://github.com/ppy/osu-server-beatmap-submission/pull/5#discussion_r1861680837.
2024-11-29 08:42:45 +01:00
Salman Alshamrani
489d7a30ec Perform a single Save call rather than doing it in each difficulty 2024-11-28 18:37:13 -05:00
Salman Alshamrani
311f0947e4 Abstractify resource change logic and share between background and audio 2024-11-28 17:57:47 -05:00
Salman Alshamrani
932afcde01 Make editor make sense 2024-11-28 17:43:32 -05:00
Jamie Taylor
58cf1c11e4
Improve menu/context-menu sample playback 2024-11-29 06:54:48 +09:00
Salman Alshamrani
b1d0939142 Add localisation support 2024-11-28 02:37:31 -05:00
Salman Alshamrani
4a1401a33d Rewrite bindable flow to make more sense 2024-11-28 02:37:27 -05:00
Dean Herbert
32b34c1967
Rename container to make more sense 2024-11-28 15:20:51 +09:00
Dean Herbert
4d9d5adbf4
Rename parameter to be more clear 2024-11-28 15:13:59 +09:00
Salman Alshamrani
efb68e4232 Refactor ResourcesSection to support new form of selection 2024-11-27 05:53:22 -05:00
Salman Alshamrani
b70fb4b0fe Add FormBeatmapFileSelector for intermediate user-choice step 2024-11-27 05:52:43 -05:00
Salman Alshamrani
3e1b4f4ac5 Rename AllowBackButton to AllowUserExit and rewrite visibility flow structure
Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-11-26 16:52:39 -05:00
Dean Herbert
3ecb3b674d
Don't reset state when changing from one selection to another in the editor
This was causing state pollution in the new selection. I can't see why
this needs to happen when a selection changes to another.

This fixes https://github.com/ppy/osu/issues/30839 and also the same
issue happening for the new combo toggle.

Tests all seem to pass, and I can't immediately find anything broken,
but YMMV.
2024-11-26 17:33:41 +09:00
Salman Alshamrani
1468385559 Reset new file states after syncing 2024-11-24 22:38:48 -05:00
Salman Alshamrani
3480da22d2 Remove no-op SaveState call 2024-11-24 01:13:39 -05:00
Salman Alshamrani
95a6226413 Only enable button if there are different filenames 2024-11-24 01:11:36 -05:00
Salman Alshamrani
a872f74974 Make sync button only affect changed resource type 2024-11-24 01:02:34 -05:00
Salman Alshamrani
c8b13b726d Add localisation support 2024-11-24 00:45:17 -05:00
Salman Alshamrani
e348b3a7aa Only enable button if there are multiple difficulties 2024-11-24 00:34:03 -05:00
Salman Alshamrani
8e20dc7e9d Add option to update all difficulties with new background/audio file 2024-11-24 00:32:50 -05:00
Salman Alshamrani
871c365fd8 Preserve existing beatmap background/audio files if used elsewhere 2024-11-24 00:32:27 -05:00
Dean Herbert
086a34f5c0
Merge branch 'master' into beatmap-info-purge 2024-11-22 18:47:32 +09:00
Bartłomiej Dach
259e9ecf65
Deactivate new combo toggle on deselecting objects
Closes https://github.com/ppy/osu/issues/30713.

Was a point of discussion doing review:

	https://github.com/ppy/osu/pull/30214#discussion_r1798833139

Given it got pointed out immediately for something so minor, I'm
inclined to believe it's a rather undesirable change.
2024-11-18 15:13:32 +01:00
Bartłomiej Dach
88aea70429
Do not permit new combo toggle to remain in indeterminate state on deselect 2024-11-14 10:07:09 +01:00
Bartłomiej Dach
1b279e45cc
Merge branch 'master' into feat/optimize-polygon-tool 2024-11-14 09:54:04 +01:00