1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Commit Graph

48601 Commits

Author SHA1 Message Date
Dean Herbert
cdd63e428c
Merge pull request #16613 from frenzibyte/improve-timeline-zoom
Decrease default timeline zoom and add saving support
2022-01-26 04:07:56 +09:00
Dean Herbert
bdf215c576
Merge branch 'master' into improve-timeline-zoom 2022-01-26 03:40:53 +09:00
Dean Herbert
1747063fd9
Merge pull request #16610 from frenzibyte/fix-beat-divisor-not-saving
Fix beat divisor no longer saving in editor
2022-01-26 03:40:31 +09:00
Dean Herbert
5085eb6801 Ensure gameplay starts by dismissing any notifications in TestSceneChangeAndUseGameplayBindings 2022-01-26 03:39:01 +09:00
Dean Herbert
342452dabf
Merge pull request #16612 from peppy/log-notifications
Log posted notifications
2022-01-26 03:06:33 +09:00
Salman Ahmed
4169e5592e Reword event handler name and update xmldoc 2022-01-25 19:36:19 +03:00
Salman Ahmed
ad18bc4983 Update timeline selection test scene with zoom changes 2022-01-25 18:57:39 +03:00
Salman Ahmed
d1cbdf63f0 Add support for reading/saving timeline zoom in editor 2022-01-25 18:57:39 +03:00
Dean Herbert
cdef67ccd0 Log posted notifications
To help with test failures and the likes.
2022-01-25 23:38:48 +09:00
Dean Herbert
5b82eaf112
Merge branch 'master' into fix-beat-divisor-not-saving 2022-01-25 23:29:37 +09:00
Dean Herbert
c32c26dc72
Merge pull request #16611 from frenzibyte/isolate-editor-test-beatmap
Recreate working beatmap per-test in `EditorTestScene`
2022-01-25 23:29:20 +09:00
Salman Ahmed
6c69df815a Update editor test scenes to set working beatmap properly 2022-01-25 15:56:27 +03:00
Dan Balasescu
b3aa9310a3
Merge pull request #16607 from peppy/key-binding-container-notification-fix
Fix `DatabasedKeyBindingContainer` re-querying realm on receiving notification
2022-01-25 21:40:21 +09:00
Dean Herbert
4a9f4eecba Use blocking calls to SynchronizationContext to guarantee order of execution 2022-01-25 20:49:52 +09:00
Salman Ahmed
a93873e8ca Recreate test beatmap of EditorTestScene on set up 2022-01-25 13:03:27 +03:00
Salman Ahmed
4d8c5ebb0c
Merge branch 'master' into fix-beat-divisor-not-saving 2022-01-25 12:30:05 +03:00
Salman Ahmed
f7f58b06a1 Fix beat divisor not saving in editor 2022-01-25 11:56:38 +03:00
Salman Ahmed
b2b6672095 Add failing test asserts 2022-01-25 11:56:38 +03:00
Dean Herbert
c0ed308016 Use more correct method of deletion in TestScenePlaySongSelect 2022-01-25 17:55:39 +09:00
Dean Herbert
90a7dd7711 In gameplay bindings test, ensure a selection is made before attempting to enter gameplay 2022-01-25 17:55:33 +09:00
Dean Herbert
ffd7877a1e Remove synchronization context hacks in realm tests 2022-01-25 17:41:22 +09:00
Dean Herbert
1a776a9587 Completely remove subscription from MusicController 2022-01-25 16:53:02 +09:00
Dean Herbert
83b0e4572a Fix test failures 2022-01-25 16:51:21 +09:00
Dean Herbert
2a786f9ec0 Load text only after it comes on screen (and tidy up selection handling logic) 2022-01-25 16:51:21 +09:00
Dean Herbert
ace2bd2208 Apply some initial optimisations to PlaylistItem 2022-01-25 16:51:21 +09:00
Dean Herbert
8a4f3a7ce0 Reimplement subscription logic in PlaylistOverlay directly 2022-01-25 16:51:21 +09:00
Dean Herbert
958cfde608 Stop detaching and exposing beatmaps from MusicController 2022-01-25 16:51:21 +09:00
Dan Balasescu
d8270fe14f
Merge pull request #16604 from peppy/less-async-import
Remove `Task` from the inner-most `Import` method in `RealmArchiveModelImporter`
2022-01-25 16:47:07 +09:00
Dan Balasescu
6e531a574d
Merge pull request #16594 from peppy/realm-subscription-tracking
Add tracking of total realm subscriptions
2022-01-25 16:46:53 +09:00
Dean Herbert
1f9cf00db8 Fix DatabasedKeyBindingContainer re-querying realm on receiving notification 2022-01-25 16:44:44 +09:00
Salman Ahmed
5a9524a74e Decrease default timeline zoom to "6 seconds visible" range 2022-01-25 10:43:51 +03:00
Dean Herbert
1bb1366c9f Fix notification reset events potentially arriving out of order if a block operation times out 2022-01-25 16:26:06 +09:00
Dean Herbert
0d575006fb
Merge pull request #16605 from peppy/fix-collection-db-migrate-crash
Fix crash when trying to migrate collection database that doesn't exist
2022-01-25 16:25:15 +09:00
Dan Balasescu
7f2e66298b
Merge branch 'master' into realm-subscription-tracking 2022-01-25 16:03:21 +09:00
Dan Balasescu
1c6ad56821
Merge pull request #16595 from peppy/realm-block-timeout-assert-failure
Fix a failed `BlockAllOperations` leaving update realm in unretrieved state
2022-01-25 16:03:13 +09:00
Dean Herbert
a46b06ffe8
Merge branch 'master' into realm-subscription-tracking 2022-01-25 15:56:35 +09:00
Dean Herbert
fc58b202b1 Fix crash when trying to migrate collection database that doesn't exist 2022-01-25 15:45:23 +09:00
Dean Herbert
778d2a71b4 Remove Task from the inner-most Import method in RealmArchiveModelImporter
One of my pending work items for post-realm merge.

The lowest-level import task is no longer asynchronous, as we don't want
it to span multiple threads to allow easier interaction with realm.
Removing the `Task` spec simplifies a heap of usages.

Individual usages should decide whether they want to run the import
asynchronously, by either using an alternative override or spooling up a
thread themselves.
2022-01-25 15:30:29 +09:00
Dean Herbert
ae0fea8e26 Fix compilation issues due to misnamed fild 2022-01-25 15:29:45 +09:00
Dan Balasescu
47a13c2eb0
Merge pull request #16603 from peppy/update-framework
Update framework
2022-01-25 15:15:49 +09:00
Dean Herbert
35e1c7de7d Merge branch 'master' into realm-block-timeout-assert-failure 2022-01-25 15:05:11 +09:00
Dean Herbert
5fb9b58c9b Add tracking of total subscriptions 2022-01-25 14:51:41 +09:00
Dan Balasescu
05a2d7fbfe
Merge pull request #16591 from peppy/fix-editor-slider-velocity-saving
Don't include nested hit objects' `DifficultyControlPoints` in legacy encoder logic
2022-01-25 14:50:09 +09:00
Dean Herbert
bda77fb6b3
Merge branch 'master' into realm-block-timeout-assert-failure 2022-01-25 14:47:34 +09:00
Dean Herbert
56d7d81465 Fix broken test due to SynchronizationContext never running expected work 2022-01-25 14:47:21 +09:00
Dan Balasescu
bfa521bdd2
Merge pull request #16593 from peppy/realm-clean-up
Clean up realm naming
2022-01-25 14:33:53 +09:00
Dan Balasescu
b2114bd2f0
Merge pull request #16601 from peppy/fix-storage-migration-test-failures
Fix `TestMigration` failing due to changes in realm migration logic
2022-01-25 14:33:35 +09:00
Dan Balasescu
8adf65d2ac
Merge pull request #16602 from peppy/restore-missing-files-on-import
During import if files are found to be missing, ensure they are restored
2022-01-25 14:31:53 +09:00
Dean Herbert
5872dabf60 Fix incorrect flag to options conversion 2022-01-25 14:16:15 +09:00
Dean Herbert
86c844bd58 Update remaining usages of GetSuitableHost in template projects 2022-01-25 14:15:29 +09:00