Dean Herbert
678b18dde6
Ensure any non-MemoryStream streams are closed as part of ImportTask
2022-06-20 15:29:56 +09:00
Dan Balasescu
a922ea9b01
Fix selection by directly comparing control points
...
Previously, all control points would get replaced, which led to
performance issues that was worked around in this PR. By comparing
control points, we're able to get good performance without requiring the
workaround.
2022-06-20 15:29:29 +09:00
Dan Balasescu
03ab6fc141
Implement IEquatable on ControlPoint
2022-06-20 15:27:43 +09:00
Dean Herbert
dd93c7359e
Update xmldoc for importFromArchive method
2022-06-20 15:25:43 +09:00
Dean Herbert
92f1a2958c
Rename Import(TModel) to ImportModel to differentiate from other import methods
2022-06-20 15:18:07 +09:00
Dean Herbert
a6c8a832aa
Remove Import(ArchiveReader) and redirect existing usages to Import(ImportTask)
2022-06-20 15:14:57 +09:00
Dean Herbert
7daab2d45b
Merge branch 'master' into skin-editor-transform-fix
2022-06-20 14:10:01 +09:00
Dean Herbert
329f1a0822
Add test coverage of original fail case and improve test reliability and code quality
2022-06-20 14:08:05 +09:00
Dan Balasescu
468e5fcbed
Merge branch 'master' into editor-controlpoint-undo-redo
2022-06-20 13:47:01 +09:00
Gabe Livengood
a5bc769243
clear skineditor selected components on hide
2022-06-19 14:34:52 -04:00
Gabe Livengood
36df1da57f
Revert "stop component transform when skineditor is hidden"
...
This reverts commit 48ffd6aeb5
2022-06-19 14:26:02 -04:00
Bartłomiej Dach
3ab8158b92
Do not try to set ruleset from beatmap if it's a dummy
2022-06-19 20:08:39 +02:00
Bartłomiej Dach
93b3ede2a0
Always use beatmap ruleset in editor gameplay test mode
...
Fixes cases where opening a convertible beatmap (so any osu! beatmap)
with the game-global ruleset being set to anything but osu! would result
in opening the editor gameplay test mode with the game-global ruleset
rather than the beatmap's.
2022-06-19 19:30:40 +02:00
Bartłomiej Dach
9023fdc947
Merge branch 'master' into reidrect-graceful-exit
2022-06-19 13:43:15 +02:00
Bartłomiej Dach
495d747da5
Fix mismatching braces in comment
2022-06-19 13:42:45 +02:00
Dan Balasescu
98d69c846c
Reset spectator speed at last frame
2022-06-19 17:12:20 +09:00
Dean Herbert
6515b249ec
Change data migration to do an immediate exit, rather than attempted exit
2022-06-19 12:39:58 +09:00
Dean Herbert
50e40756c4
Rename GracefullyExit to AttemptExit
2022-06-19 12:34:44 +09:00
Salman Ahmed
a2e17941e5
Merge branch 'master' into timing-offset-adjust-seek-only-at-start
2022-06-19 01:27:44 +03:00
Bartłomiej Dach
2a95715652
Merge branch 'master' into fix-input-regression
2022-06-18 19:44:53 +02:00
Salman Ahmed
f7fc456bb1
Merge branch 'master' into reidrect-graceful-exit
2022-06-18 19:37:53 +03:00
Dean Herbert
3902dc64f0
Fix adjusting offset via button seeking to timing point's offset unexpectedly
...
This was added with the intention of tracking the offset when already at
the start (the most common case when you're using the tap timing
wizard), but was also seeking when the user may be much further beyond
or before it.
Addresses https://github.com/ppy/osu/discussions/18741#discussioncomment-2975051 .
2022-06-19 01:35:45 +09:00
Dean Herbert
b2663d9399
Update xmldoc to suggest that GracefullyExit may be overridden
2022-06-19 01:14:48 +09:00
Dean Herbert
3fa8c19acd
Merge branch 'master' into latency-certifier/hidden-cursor
2022-06-19 00:31:11 +09:00
Salman Ahmed
a5e5172b91
Fix BlueprintContainer eating input from skin editor buttons
2022-06-18 18:28:36 +03:00
Dean Herbert
56abe54fe6
Redirect graceful exiting to standard exit flow
...
Rather than doing a completely forced exit as we were, this will now
follow a more standard flow with the ability for the user to abort along
the way. This is more in line with how I wanted this to work.
Note that this means a confirmation is now shown. It has been discussed
in the past that this confirmation should only show when there's an
ongoing action implies the user may want to cancel the exit. For now I
think this is fine.
Addresses
https://github.com/ppy/osu/discussions/18399#discussioncomment-2811311
2022-06-18 23:43:46 +09:00
Bartłomiej Dach
5917c70127
Merge branch 'master' into multi-song-select-operation
2022-06-18 11:58:13 +02:00
Bartłomiej Dach
f6a3047596
Merge branch 'master' into editor-metadata-name-unification
2022-06-18 10:22:52 +02:00
Dan Balasescu
77e7e4ecb2
Fix selection being blocked after early return
2022-06-18 14:28:30 +09:00
Dean Herbert
bd5037fcad
Fix new hitobject placements not taking on the existing sample settings
...
Similar to velocity / difficulty points, a user expectation is that
volume and sample settings will be transferred to newly placed objects
from the most recent one.
Closes https://github.com/ppy/osu/issues/18742 .
2022-06-18 13:49:59 +09:00
Dean Herbert
8ad96fd94b
Update resources
2022-06-18 10:55:24 +09:00
Salman Ahmed
204348f327
Fix metronome playing mistimed beat sounds on editor clock resume
2022-06-18 04:49:44 +03:00
Salman Ahmed
8a1d11fefb
Cancel previous metronome sound playback on pause
2022-06-18 04:07:21 +03:00
Dan Balasescu
e04df371d1
Merge branch 'master' into multi-song-select-operation
2022-06-18 08:51:24 +09:00
Dan Balasescu
14cdb01fd8
Revert unintended change
2022-06-18 08:49:48 +09:00
Gabe Livengood
48ffd6aeb5
stop component transform when skineditor is hidden
2022-06-17 11:28:58 -04:00
Dean Herbert
4bc26dbb48
Merge pull request #18743 from smoogipoo/nullable-by-default
...
Enable NRT by default
2022-06-17 23:18:35 +09:00
Dean Herbert
5d93db1522
Merge pull request #18726 from peppy/disclaimer-stop-handling-after-suspend
...
Fix `Disclaimer` screen handling user change events after initial display
2022-06-17 18:28:06 +09:00
Dean Herbert
1900480d51
Inline animation method
2022-06-17 17:06:06 +09:00
Dan Balasescu
869db52540
Tie loading layer to ongoing operation state
2022-06-17 17:05:23 +09:00
Dean Herbert
e51babdb96
Change heart animation flow to be more correct
2022-06-17 17:01:11 +09:00
Jamie Taylor
1f78a4fadd
New audio feedback for metronome
2022-06-17 16:56:09 +09:00
Dan Balasescu
fd9902e816
Manual #nullable processing
2022-06-17 16:38:35 +09:00
Dan Balasescu
f8830c6850
Automated #nullable processing
2022-06-17 16:37:17 +09:00
Dan Balasescu
ea191da496
Merge pull request #18728 from peppy/fix-unsafe-sample-playback
...
Fix unsafe sample playback in `GameplaySampleTriggerSource`
2022-06-17 12:26:46 +09:00
Bartłomiej Dach
6ff6a3f5b3
Rename and document chooserPath
2022-06-16 21:51:31 +02:00
Bartłomiej Dach
6f2f4dda37
Merge branch 'master' into fix-up-down
2022-06-16 21:44:56 +02:00
Salman Ahmed
db02cb81c5
Fix file chooser path not opening home directory initially
2022-06-16 20:48:17 +03:00
Salman Ahmed
f7a27b412a
Revert "Let latency certifier buttons steal hover from area"
...
This reverts commit beb0331640
2022-06-16 20:35:30 +03:00
Salman Ahmed
e4ddf03ad6
Fix toolbar music button handling keys while not hovered
2022-06-16 20:22:57 +03:00
Salman Ahmed
8e088140b2
Reword comment since IRequireHighFrequencyMousePosition isn't the issue
2022-06-16 20:09:10 +03:00
Salman Ahmed
beb0331640
Let latency certifier buttons steal hover from area
2022-06-16 20:00:30 +03:00
Salman Ahmed
ed6817ae6a
Allow switching between latency and menu cursor using IProvideCursor
2022-06-16 19:46:31 +03:00
Salman Ahmed
52538dc708
Refactor LatencyCursorContainer to become a cursor container
2022-06-16 19:46:04 +03:00
Salman Ahmed
47d0ecf5e8
Merge branch 'master' into editor-metadata-name-unification
2022-06-16 18:53:23 +03:00
Salman Ahmed
6aee689586
Fix previous file lookup not using metadata properties
2022-06-16 18:50:38 +03:00
Salman Ahmed
f1081db953
Fix background/track implicitly renamed on initial load
2022-06-16 18:48:32 +03:00
Bartłomiej Dach
651862fee0
Merge branch 'master' into database-migration-reliability
2022-06-16 17:19:58 +02:00
Dean Herbert
bf6c6682bc
Move null to finally
2022-06-16 23:37:24 +09:00
Dean Herbert
7809566f16
Add explanatory comments
2022-06-16 23:31:49 +09:00
Dean Herbert
7b0fad6461
Null disposal token after use
2022-06-16 23:29:33 +09:00
Bartłomiej Dach
9c4f6d2ce0
Merge branch 'master' into first-run-setup-notification-interruption
2022-06-16 15:14:40 +02:00
Dean Herbert
d48fbdb439
Merge branch 'bmm-cleanup' into bmm-cleanup-2
2022-06-16 19:48:54 +09:00
Dean Herbert
e66ccfd980
Add back missing notification flow
2022-06-16 19:48:18 +09:00
Dean Herbert
448eee051a
Update filename to match new class name
2022-06-16 19:41:14 +09:00
Dean Herbert
3860f0b3e5
Remove unused GetWorkingBetamap method
2022-06-16 19:08:59 +09:00
Dean Herbert
ce3d3a967c
Reimplement missing methods
2022-06-16 19:05:25 +09:00
Bartłomiej Dach
a635664a86
Fix invalid method reference in comment
...
`BeatmapModelManager.Save()` was moved to `BeatmapManager`, not to
`BeatmapImporter`.
2022-06-16 12:01:53 +02:00
Dean Herbert
72c5b9009d
Remove local realm fields in manager classes
2022-06-16 18:56:53 +09:00
Dean Herbert
f3984d98e6
Remove RealmArchiveModelManager from hierarchy
2022-06-16 18:53:13 +09:00
Dean Herbert
8a5755ca52
Remove pointless override in test implementation
2022-06-16 18:27:16 +09:00
Dean Herbert
04e4c5ef88
Move and adjust implementation regions to restore sanity
2022-06-16 18:26:13 +09:00
Dean Herbert
4d9e3d1982
Rename Score/Skin ModelManager classes to Importer for now
2022-06-16 18:11:50 +09:00
Dean Herbert
1f3e1b2d97
Combine BeatmapManager and BeatmapModelManager into one class
2022-06-16 18:07:04 +09:00
Dean Herbert
8ea3042435
Move file extensions specification to common class
2022-06-16 18:00:27 +09:00
Dean Herbert
84dba36cf5
Update usages of BeatmapModelManager which only require importing to use BeatmapImporter
2022-06-16 17:59:24 +09:00
Dean Herbert
4c372539a1
Consolidate remaining methods in BeatmapModelManager
2022-06-16 17:59:24 +09:00
Dean Herbert
251923c106
Convert NotificationOverlay to NRT
2022-06-16 17:28:08 +09:00
Dean Herbert
6b30ee0950
Tidy up DI and binding logic
2022-06-16 17:26:43 +09:00
Dean Herbert
953ca8c2dd
Merge pull request #18715 from bdach/ruleset-mod-hardening
...
Add several protections when creating game-global available mods
2022-06-16 17:18:49 +09:00
Dean Herbert
4526f8c07d
Move database backup creation to async thread where possible
2022-06-16 17:01:17 +09:00
Dean Herbert
17dbb599d1
Don't backup collection database
...
This is no longer required due to recent changes which mean the
collection database will retain beatmap references even if they aren't
loaded locally (see https://github.com/ppy/osu/pull/18619 ).
2022-06-16 16:48:53 +09:00
Dean Herbert
739a696467
Ensure reading of existing databases when making backups doesn't create a file
2022-06-16 16:48:06 +09:00
Dean Herbert
ec53d87c30
Fix unsafe sample playback in GameplaySampleTriggerSource
...
Resolves https://github.com/ppy/osu/issues/18727 .
Added delay from `Schedule` should be minimal as it is always called
from the `Update` thread (input propagation) anyway.
2022-06-16 16:04:57 +09:00
Dean Herbert
89533fa33d
Fix Disclaimer screen handling user change events after initial display
...
Unnecessary overhead, but also should resolve a production hard crash.
2022-06-16 15:40:20 +09:00
Dean Herbert
ac554ca51f
Update resources
2022-06-16 15:06:34 +09:00
Bartłomiej Dach
f88c568c8d
Update flag sizes after switch to twemoji assets
...
The old flags used a size of 150x100, while the new assets based on
twemoji use a size of 150x108. Update existing usages to match this new
aspect ratio better.
2022-06-15 21:45:47 +02:00
Salman Ahmed
2c35b1404b
Use FileInfo as current bindable type
2022-06-15 19:29:09 +03:00
Salman Ahmed
5d74d92fcf
Revert virtual current bindable
2022-06-15 19:28:43 +03:00
Salman Ahmed
e7dcbddbeb
Fix potential null reference
2022-06-15 18:53:49 +03:00
Bartłomiej Dach
1acbb87aa6
Ensure AvailableMods.Value is never null
2022-06-15 17:40:16 +02:00
Bartłomiej Dach
30382b0445
Fill out GetModsFor() xmldoc and annotate items as non-null
2022-06-15 17:40:15 +02:00
Bartłomiej Dach
e74b563b91
Add protection against arbitrary exceptions from GetModsFor()
2022-06-15 17:31:46 +02:00
Bartłomiej Dach
6e5e506fb4
Add protection against rulesets returning null mods
2022-06-15 17:31:46 +02:00
Salman Ahmed
026bad7fc4
Use notification processing mode logic instead
2022-06-15 18:13:24 +03:00
Salman Ahmed
1ff070f5ff
Decouple LabelledFileChooser from LabelledTextBoxWithPopover
2022-06-15 17:45:31 +03:00
Dean Herbert
f23ddfe6cc
Move remaining realm classes out of Stores namespace
2022-06-15 21:56:00 +09:00
Dean Herbert
23d7667f39
Move BeatmapImporter to correct namespace
2022-06-15 21:47:52 +09:00
Dean Herbert
9edc4fc181
Remove unnecessary ShouldDeleteArchive override (already done in base implementation)
2022-06-15 21:47:52 +09:00
Dean Herbert
7571ab6c63
Merge branch 'master' into new-dialog-sfx
2022-06-15 19:47:00 +09:00
Dean Herbert
7a2919975a
Fix sound clash when exiting a multiplayer room with confirmation
2022-06-15 18:48:22 +09:00
Dan Balasescu
d89c80ace2
Block operations during beatmap selection in match
2022-06-15 18:44:16 +09:00
Dean Herbert
1520ccf865
Fix double back sound due to sub screen presence in multiplayer/playlists
2022-06-15 18:44:16 +09:00
Dean Herbert
c27e5d1216
Fix editor still playing back sound when exiting with confirmation
2022-06-15 18:44:02 +09:00
Dean Herbert
e880fcf3cb
Merge pull request #18704 from peppy/update-framework
...
Update framework
2022-06-15 18:06:11 +09:00
Dean Herbert
584345a97e
Merge pull request #18693 from frenzibyte/toolbar-volume-control
...
Add basic volume control support in toolbar music button
2022-06-15 17:50:10 +09:00
Dean Herbert
be2b4e68b9
Don't play player exit sound when restarting
2022-06-15 17:49:18 +09:00
Dean Herbert
713cff3403
Don't play editor exit sound when changing difficulties
2022-06-15 17:49:09 +09:00
Dean Herbert
fd4529aa7c
Play editor exit sound if no confirmation buttons were shown during exit process
2022-06-15 17:37:54 +09:00
Dean Herbert
7ac5019c08
Fix intro screens playing exit sounds
2022-06-15 17:37:30 +09:00
Dean Herbert
6136e4e27a
Don't play exit sound if screen is in a non-resumable state when exiting
2022-06-15 17:37:25 +09:00
Dean Herbert
b3aa4fcf02
Adjust a channel rather than the overall sample
2022-06-15 17:33:07 +09:00
Dean Herbert
94aa2248ca
Move filter reset to more appropriate location
2022-06-15 17:32:21 +09:00
Dean Herbert
87bf53485a
Merge pull request #18649 from frenzibyte/selection-context-outside-bounds
...
Fix context menus not appearing when clicking outside of editor playfield's bounds
2022-06-15 17:08:09 +09:00
Dean Herbert
080f2859ef
Merge pull request #18689 from peppy/quick-import-only-on-batch
...
Always perform full consistency checks for single imports
2022-06-15 17:06:06 +09:00
Dean Herbert
accd6031bd
Update framework
2022-06-15 16:53:56 +09:00
Dean Herbert
1f1633ddc2
Remove Update method processing of samples in PopupDialogDangerousButton
2022-06-15 16:50:23 +09:00
Salman Ahmed
583619b915
Use GlobalAction.DecreaseVolume instead
2022-06-15 10:21:27 +03:00
Dean Herbert
eac0ca4db6
Update resources
2022-06-15 16:14:46 +09:00
Salman Ahmed
dfab8b71f6
Merge branch 'master' into stable-beatmap-recursive-import
2022-06-15 10:06:46 +03:00
Dean Herbert
873806c2ea
Add keyboard adjustment support
2022-06-15 15:58:22 +09:00
Dean Herbert
3df9d7c9e1
Add a bit more animation when adjusting
2022-06-15 15:56:59 +09:00
Salman Ahmed
6a8cf514e0
Update background/track file chooser to not display filename
2022-06-15 09:52:13 +03:00
Dean Herbert
5eb56ab814
Ensure Master volume is updated when scrolling on toolbar button
2022-06-15 15:41:40 +09:00
Jamie Taylor
5e3ccf7087
Don't play 'back' sample when exiting Editor
2022-06-15 15:41:28 +09:00
Jamie Taylor
6b744a14b0
Move 'back' sample playback from OnResuming to OnExiting
2022-06-15 15:41:28 +09:00
Jamie Taylor
af87722be8
Add audio feedback for 'Dangerous' dialog buttons
2022-06-15 15:41:27 +09:00
Jamie Taylor
930ec2a197
Add specific samples for dialog 'Ok' and 'Cancel' buttons
2022-06-15 15:41:27 +09:00
Dean Herbert
5201057a62
Change batch import to require at least 10 items
2022-06-15 15:31:58 +09:00
Dean Herbert
abe947bcb0
Update outdated xmldoc comments
2022-06-15 15:31:45 +09:00
Dean Herbert
19543685ff
Merge branch 'master' into quick-import-only-on-batch
2022-06-15 15:27:06 +09:00
Dean Herbert
cca7633e59
Rename variables and remove unnecessary nested call to GetFullPath
2022-06-15 15:05:51 +09:00
Salman Ahmed
f3f0960335
Use unified filename for background and track during editor import
2022-06-15 09:02:48 +03:00
Salman Ahmed
d3feb07bc1
Split zoom updating to named method with value as optional
2022-06-15 07:57:16 +03:00
Salman Ahmed
22c09ec893
Handle subdirectories during beatmap stable import
2022-06-15 07:33:21 +03:00
Salman Ahmed
ee8045d507
Add failing test case
2022-06-15 07:33:21 +03:00
Salman Ahmed
268a7e1334
Fix ZoomableScrollContainer attempting to update zoom with overlapping range
2022-06-15 05:43:41 +03:00
Salman Ahmed
ddeee09a51
Fix important notifications interrupting first-run setup
2022-06-15 03:40:05 +03:00
Salman Ahmed
1171d44ad9
Add failing test case
2022-06-15 03:37:04 +03:00
Salman Ahmed
36599d1174
Merge branch 'master' into fix-hit-error-when-not-visible
2022-06-14 22:47:11 +03:00
Salman Ahmed
1f31e3fb51
Add volume UI to toolbar music button
2022-06-14 22:15:12 +03:00
Salman Ahmed
7f23677972
Add volume control support via toolbar music button
2022-06-14 22:15:12 +03:00
Dean Herbert
49ec2572b8
Allow scrolling overflow of ruleset buttons in the toolbar
2022-06-15 01:43:10 +09:00
Salman Ahmed
d89c11e49e
Allow Toolbar to block scroll input from passing through
2022-06-14 19:10:13 +03:00
Dean Herbert
6be4209458
Fix AlwaysPresent specification in wrong container
2022-06-15 01:04:43 +09:00
Dean Herbert
88d5e074a8
Rename lowPriority to batchImport
2022-06-15 00:46:00 +09:00
Dean Herbert
f11fe54385
Remove custom hash function flow
2022-06-15 00:42:30 +09:00
Dean Herbert
2f8290831a
Skip quick import clause when importing a single item
...
Closes https://github.com/ppy/osu/issues/18600 .
2022-06-15 00:26:34 +09:00
Dean Herbert
7affef75b0
Remove unused Import method in SkinManager
2022-06-15 00:26:34 +09:00
Dean Herbert
cf2238f683
Merge pull request #18688 from peppy/too-many-import-methods
...
Various clean-up on model managers / importer classes
2022-06-15 00:12:33 +09:00
