1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:02:55 +08:00
Commit Graph

26408 Commits

Author SHA1 Message Date
Dean Herbert
57a21dfb1c Update framework 2021-06-30 16:11:18 +09:00
Dean Herbert
4a71a4bb21
Merge pull request #13450 from smoogipoo/spectator-start-at-end-2
Start spectator at the end of gameplay
2021-06-30 16:09:35 +09:00
Dean Herbert
094cd31361
Merge pull request #13441 from frenzibyte/ruleset-resources-skin
Provide access to ruleset resources during `ISkinSource` lookups
2021-06-30 15:26:37 +09:00
Dean Herbert
a019f2cc5c
Merge branch 'master' into rework-multiplayer-test-scenes 2021-06-30 13:49:05 +09:00
Dean Herbert
825181121d
Merge branch 'master' into spectator-start-at-end-2 2021-06-30 01:50:14 +09:00
Dean Herbert
5031707048
Merge pull request #13690 from smoogipoo/fix-action-posting
Fix commands posted to the wrong channel
2021-06-30 00:39:02 +09:00
smoogipoo
6dd3c6fe93 Make MultiSpectatorScreen and tests more resillient to timing 2021-06-29 22:45:51 +09:00
Dean Herbert
2f1203085b Also add logging of realm block/flush operations 2021-06-29 20:23:25 +09:00
Dean Herbert
9acc5e38bb Add basic logging for osu! storage migration
When looking into the test failure at https://github.com/ppy/osu/runs/2940065457, it became apparent that we are not showing the migration process anywhere in logs. It's the cause of many issues, and we would want to see this in CI and user logs when occurring.
2021-06-29 20:23:25 +09:00
smoogipoo
bfdbe3c3fe Fix clocks getting added a second time 2021-06-29 17:29:25 +09:00
smoogipoo
8e04d73b67 Merge branch 'rework-multiplayer-test-scenes' into spectator-start-at-end-2 2021-06-29 17:06:57 +09:00
smoogipoo
ca0eaab8e2 Add test 2021-06-29 16:30:46 +09:00
smoogipoo
7a86686f40 Make nullable 2021-06-29 16:30:40 +09:00
smoogipoo
9132c42f87 Fix actions posted to the wrong channel 2021-06-29 15:58:07 +09:00
smoogipoo
bcdf36e77b Merge branch 'master' into spectator-start-at-end-2 2021-06-29 15:53:58 +09:00
smoogipoo
92fa99700e Merge branch 'master' into rework-multiplayer-test-scenes 2021-06-29 15:39:59 +09:00
smoogipoo
a3b1e1d5fc Check for null ruleset in FilterCriteria 2021-06-29 15:18:40 +09:00
Dan Balasescu
697b07acb1
Merge branch 'master' into fix-beatmap-import-fk-failure 2021-06-29 11:36:31 +09:00
Dan Balasescu
471bf9a752
Merge pull request #13681 from peppy/score-submit-ruleset-id
Serialise and send ruleset ID as part of score submission
2021-06-29 11:27:13 +09:00
Dean Herbert
e4ca6a4266 Serialise and send ruleset ID as part of score submission 2021-06-29 01:55:09 +09:00
Dan Balasescu
a9084db665
Merge pull request #13673 from peppy/import-early-checksum-abort
Shortcut import process to speed up duplicate imports
2021-06-28 19:55:09 +09:00
Dan Balasescu
8950757b61
Merge pull request #13618 from peppy/fix-realm-state-change-crashes
Fix realm threading issues to make it releaseable
2021-06-28 19:54:49 +09:00
Dan Balasescu
92fcf90768
Merge branch 'master' into import-early-checksum-abort 2021-06-28 19:29:08 +09:00
Salman Ahmed
66fc95c111 Use LastOrDefault instead 2021-06-28 12:43:58 +03:00
Salman Ahmed
7197998a10 Remove resolution to SkinManager and use pattern matching instead 2021-06-28 12:43:13 +03:00
Salman Ahmed
177bfe1234 Merge branch 'master' into ruleset-resources-skin 2021-06-28 11:16:37 +03:00
Dean Herbert
a8597b6213
Merge pull request #13658 from frenzibyte/fix-initial-ruleset-skin-loading
Fix `RulesetSkinProvidingContainer` being potentially late in setting up skin sources
2021-06-28 17:03:56 +09:00
Dean Herbert
d4ea73d727 Simplify disposal exceptions 2021-06-28 16:17:09 +09:00
Dean Herbert
f78cedd0e1 Reorder methods and add xmldoc for BlockAllOperations 2021-06-28 16:16:40 +09:00
Dean Herbert
90f0bc87f5 Add safety against double disposal 2021-06-28 16:12:21 +09:00
Dean Herbert
842f033522 Remove no longer necessary exception 2021-06-28 16:11:55 +09:00
Dean Herbert
f7aba7360a
Merge pull request #13654 from Henry-YSLin/fix-invisible-number-box
Refactor `SeedSettingsControl` and `SettingsNumberBox`
2021-06-28 16:07:30 +09:00
Dean Herbert
0d2bc4fc5f Merge branch 'master' into fix-realm-state-change-crashes 2021-06-28 16:03:58 +09:00
Salman Ahmed
779a1b322c
Add comment explaining insertion of ruleset skin before default skin
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-06-28 09:38:42 +03:00
Dean Herbert
e4780d4b06 Update framework 2021-06-28 15:29:47 +09:00
Dean Herbert
f939e2603a Merge branch 'master' into localisable-tooltips 2021-06-28 15:29:42 +09:00
Dean Herbert
eeb56970ef Make OutlinedNumberBox private and nested again 2021-06-28 15:24:55 +09:00
Salman Ahmed
f598de4cdb ResourcesSkin -> ResourceStoreBackedSkin 2021-06-28 09:18:29 +03:00
Salman Ahmed
692f24437e Maintain ruleset resources skin across multiple source changes 2021-06-28 09:11:28 +03:00
Dean Herbert
7dd566dc46
Add null check for safety
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-28 15:08:49 +09:00
Dean Herbert
c281e43cd8 Remove Dispose() special case and add explicit exception to make debugging issues non-deadlock 2021-06-28 15:04:14 +09:00
Dean Herbert
f777741ca7 Simplify instantiation 2021-06-28 14:51:27 +09:00
Dean Herbert
e387feb1d6 Add inline comment mentioning why CreateChildDependencies is being used in this instance 2021-06-28 14:39:55 +09:00
Dean Herbert
fdd6778f36
Merge branch 'master' into fix-initial-ruleset-skin-loading 2021-06-28 14:35:34 +09:00
Dean Herbert
a3946a1265
Fix typo in newly added xmldoc
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-06-28 14:07:21 +09:00
Henry Lin
3d19364a71 Use BindValueChanged instead of setting the value in property setter 2021-06-28 11:20:00 +08:00
Dean Herbert
4d6002ab88 Remove redundant string interpolation (and mark all local logging strings as verbatim) 2021-06-28 12:16:15 +09:00
Henry Lin
0cceef8da5 Moved the string to int? conversion logic into SettingsNumberBox 2021-06-28 11:00:07 +08:00
Dean Herbert
4a557e73a7 Add logging to help understand existing case skips better 2021-06-28 10:42:42 +09:00
Dan Balasescu
9c0840268a
Merge pull request #13598 from JimmyC7834/supporter-only-filter-content
Add supporter required placeholder in beatmap listing overlay
2021-06-28 10:27:56 +09:00