MK56
c17ff49427
Merge branch 'ppy:master' into Wiggle-strength-duration
2022-01-25 19:57:14 +01: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
342452dabf
Merge pull request #16612 from peppy/log-notifications
...
Log posted notifications
2022-01-26 03:06:33 +09: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
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
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
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
Dean Herbert
8116806db3
Add test coverage of calling BlockAllOperations a second time after timeout
2022-01-25 14:00:58 +09:00
Dean Herbert
9ad4d66e4d
Merge branch 'realm-clean-up' into realm-block-timeout-assert-failure
2022-01-25 13:58:36 +09:00
Dean Herbert
a5c76a9647
Fix a few more cases of "context" terminology usage
2022-01-25 13:56:47 +09:00
Dean Herbert
dd2caea694
Update GetSuitableHost usages in line with new HostOptions
2022-01-25 13:52:02 +09:00
Dean Herbert
df1297ade6
Update framework
2022-01-25 13:50:41 +09:00
Dean Herbert
bbcc149e2e
During import if files are found to be missing, ensure they are restored
...
This is one step closer to sanity in terms of physical files. As per the
comment I have left in place, we really should be checking file sizes or
hashes, but to keep things simple and fast I've opted to just cover the
"missing file" scenario for now.
Ran into this when testing against a foreign `client.realm` by:
- Noticing a beatmap doesn't load
- Deleting said beatmap
- Downloading via beatmap overlay
- Beatmap is restored but still doesn't work
Note that I've kept the logic where this will undelete an existing
import rather than create one from fresh, as I think that is beneficial
to the user (ie. it will still keep any linked scores on restore).
2022-01-25 13:44:54 +09:00
Dean Herbert
7d63999eef
Merge pull request #16473 from mk56-spn/Liswiera-FL-changes
...
Add method of adjusting flashlight radius in flashlight mod
2022-01-25 13:16:39 +09:00
Dean Herbert
d7342880f5
Update remaining cases of clashes with realm.Write and realm.RegisterForNotifications
2022-01-25 13:09:48 +09:00
Dean Herbert
e23b10e6a5
Update remaining cases of clashing variable name in realm.Run(realm..
2022-01-25 13:04:05 +09:00
Dean Herbert
3e5c9e8436
Fix cases of Access instead of Realm
2022-01-25 12:58:15 +09:00
Dean Herbert
2d34831b5f
Fix TestMigration failing due to changes in realm migration logic
...
Fixes failures as seen at https://github.com/ppy/osu/runs/4927916031?check_suite_focus=true .
2022-01-25 12:54:40 +09:00
Bartłomiej Dach
8c3fbb6eb4
Merge branch 'master' into Liswiera-FL-changes
2022-01-24 21:32:36 +01:00
Bartłomiej Dach
2375420d4c
Tweak allowable ranges of size multiplier
2022-01-24 21:32:31 +01:00
Bartłomiej Dach
4a13c93ca7
Disallow zero size multiplier in flashlight implementations
2022-01-24 21:03:03 +01:00
Bartłomiej Dach
a227af75ed
Simplify flashlight parameter passing flow
2022-01-24 21:03:02 +01:00
Bartłomiej Dach
5874475dff
Extract DefaultFlashlightSize to base flashlight class
2022-01-24 21:03:02 +01:00
Bartłomiej Dach
a7c0d507ce
Rename flashlight settings to be more accurate
2022-01-24 21:03:02 +01:00
