1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 05:42:54 +08:00
Commit Graph

41796 Commits

Author SHA1 Message Date
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
06beeee4d8 Cleanup match header test 2021-06-29 15:39:01 +09:00
smoogipoo
a3b1e1d5fc Check for null ruleset in FilterCriteria 2021-06-29 15:18:40 +09:00
Dan Balasescu
f547afe617
Merge pull request #13633 from peppy/fix-beatmap-import-fk-failure
Fix import flow potentially hitting foreign key constraint
2021-06-29 15:03:13 +09:00
Gagah Pangeran Rosfatiputra
a1fe9df378
add test to check sprite image width 2021-06-29 10:14:51 +07:00
Gagah Pangeran Rosfatiputra
d88d264491
prevent image sprite exceed its parent width 2021-06-29 09:49:45 +07: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
Salman Ahmed
69dac018c7 Make OsuModSpinIn as incompatible with other IHidesApproachCircles mods
Respecting the TODO comment above it, mark `OsuModSpinIn` as
incompatible with other `IHidesApproachCircles` mods as well.
2021-06-28 21:20:07 +03:00
Salman Ahmed
baf736026b Mark IHidesApproachCircles mods as incompatible with IRequiresApproachCircles 2021-06-28 21:20:07 +03:00
Salman Ahmed
6a67a6736a Mark IRequireApproachCircles mods as incompatible with IHidesApproachCircles 2021-06-28 21:20:07 +03:00
Salman Ahmed
006cc331c8 Separate IMutateApproachCircles to requiring and hiding 2021-06-28 21:20:07 +03:00
Dean Herbert
e4ca6a4266 Serialise and send ruleset ID as part of score submission 2021-06-29 01:55:09 +09:00
Gagah Pangeran Rosfatiputra
e58f690210
centering image sprite 2021-06-28 21:09:00 +07:00
Gagah Pangeran Rosfatiputra
2b8d41c045
add BlockImageContainer
change from AutoSize Both to AutoSize Y and RelativeSize X
2021-06-28 21:04:56 +07:00
Gagah Pangeran Rosfatiputra
1c074ff018
add BlockMarkdownImage
change from AutoSize Both to AutoSize Y and RelativeSize X
2021-06-28 21:04:13 +07:00
Gagah Pangeran Rosfatiputra
0e29ae037b
add wide image test 2021-06-28 20:50:29 +07:00
Gagah Pangeran Rosfatiputra
ab977d91f0
fix image test not load
looks like forgot to change this after `CurrentPath` shenanigan
2021-06-28 20:40:22 +07: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
Dean Herbert
83ab075042
Merge pull request #13680 from smoogipoo/disable-realm-analytics
Disable Realm analytics submission
2021-06-28 18:25:44 +09:00
smoogipoo
b5c3c9d550 Disable realm analytics submission 2021-06-28 17:37:58 +09:00
Salman Ahmed
035fe2ad49 Mark ruleset skin provider test scene as headless 2021-06-28 11:29:43 +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
Dean Herbert
66b6b014a9
Merge pull request #13663 from bdach/localisable-tooltips
Update usages of `IHasTooltip` in line with framework localisation changes
2021-06-28 16:02:29 +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
Dean Herbert
88c6143aae Rename variables in line with standards 2021-06-28 15:23:19 +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
73bd88cb31 Simplify caching in test 2021-06-28 14:44:52 +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