1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-25 18:17:22 +08:00

26536 Commits

Author SHA1 Message Date
Dean Herbert
0522500a57 Fix a couple of merge oversights 2021-07-01 19:45:17 +09:00
Dean Herbert
31dbc7798b Merge branch 'master' into linkify-metadata 2021-07-01 19:41:33 +09:00
smoogipoo
a78d1b4c2e Update SR colours to match osu-web 2021-07-01 19:37:21 +09:00
Dean Herbert
3816c486d5 Guard against a potential startup crash if user's preferred ruleset has a compatibility issue
Resolves this issue seen at https://github.com/ppy/osu/issues/13722#issuecomment-872088071.
2021-07-01 19:03:58 +09:00
Dean Herbert
82fd8b13df
Merge pull request #13720 from Game4all/localise-dashboard-friends
Localise friends view in dashboard overlay
2021-07-01 18:20:18 +09:00
Dean Herbert
74c63e15be Mark score failed on fail and exit 2021-07-01 17:48:09 +09:00
Dean Herbert
b00ee67895 Remove excess whitespace 2021-07-01 17:25:47 +09:00
Dean Herbert
04b874bb00 Add flow for submitting score on exiting SubmittingPlayer 2021-07-01 17:02:33 +09:00
Dean Herbert
5bc970af0d Make TestPlayer inherit from SoloPlayer for more flexibility in testing 2021-07-01 16:55:33 +09:00
Bartłomiej Dach
583242d96d Add osu!-styled colour picker control 2021-06-30 23:25:50 +02:00
Lucas A
939b2baafe Localise overlay "Scroll to top" button. 2021-06-30 22:19:04 +02:00
Lucas A
8da6ecf6a9 Localise OverlayPanelDisplayStyle tab control. 2021-06-30 21:28:07 +02:00
Lucas A
f2287ba022 Localise friends online status stream control. 2021-06-30 21:16:21 +02:00
Lucas A
285c49be7e Localise dashboard overlay header. 2021-06-30 20:28:27 +02:00
Dean Herbert
00d3baef11 Exit handling flow 2021-06-30 20:23:48 +09:00
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
Gagah Pangeran Rosfatiputra
3a002e357a
rename method 2021-06-29 19:28:21 +07: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
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
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
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