1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Commit Graph

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
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
Dean Herbert
90b87cbb9e Add back unidirectional online id check 2021-06-28 10:11:27 +09:00
Dean Herbert
9a96cd4a1d Revert "Remove comparison of online beatmap IDs during dedupe checks"
This reverts commit 15af28d2a0.
2021-06-28 09:54:18 +09:00
Dean Herbert
a1e8cc5444
Merge pull request #13669 from Naxesss/hitsound-checks
Add hitsound checks
2021-06-28 03:13:43 +09:00
Naxess
9f9e96ce9e Add check for spanDuration <= 0 prior to division 2021-06-27 15:40:09 +02:00
Naxess
a4a5325b73 Improve acceptable difference for repeat edges
Likelihood that `spanDuration` is greater than E+7 is quite low in any realistic case, so this should work fine.
2021-06-27 15:39:31 +02:00
Dean Herbert
e755dcc34d Add log method for new flow 2021-06-27 20:37:12 +09:00
Dean Herbert
f470b7095d Move private method down in class 2021-06-27 20:36:01 +09:00
Dean Herbert
f216404952 Fix missing undelete call on using existing 2021-06-27 20:22:48 +09:00
Dean Herbert
9120321731 Add comments mentioning shortcomings and avoid potential double check 2021-06-27 19:07:35 +09:00
Dean Herbert
44f875b802 Bypass optimised existing check in SkinManager (due to custom hashing function) 2021-06-27 16:35:13 +09:00
Dean Herbert
e493685c14 Add optimised existing check earlier in import process 2021-06-27 16:34:40 +09:00
Dean Herbert
15af28d2a0 Remove comparison of online beatmap IDs during dedupe checks 2021-06-27 14:48:57 +09:00
Dean Herbert
46f8100f43 Remove overly verbose logging during beatmap imports 2021-06-27 14:29:02 +09:00
Dean Herbert
d1f852d102 Make Populate abstract to avoid unnecessary base call async complexity 2021-06-27 14:29:02 +09:00
Naxess
4cfa0ae5ec Improve precision for repeat edges 2021-06-27 03:26:35 +02:00
Naxess
2cd7eda3c4 Add "or equal to" to volume threshold xmldocs 2021-06-27 02:30:12 +02:00
Naxess
0c0fd291d9 Order hitobjects by endtime 2021-06-27 01:25:03 +02:00
Naxess
4796b1b208 Use local variables for hasHitsound & couldHaveHitsound 2021-06-27 00:04:30 +02:00
Naxess
5bc08ebadb Rename hasHitsounds -> mapHasHitsounds 2021-06-26 23:49:25 +02:00
Naxess
d29e6f4695 Add negligible template to PossibleTemplates 2021-06-26 23:49:06 +02:00
Naxess
1913084342 Use HitSampleInfo.AllAdditions instead of new list 2021-06-26 23:48:28 +02:00
Naxess
f78cc9397e Factor out edge type logic 2021-06-26 20:45:31 +02:00
Naxess
51147405c5 Make || and && priority explicit 2021-06-26 20:44:39 +02:00
Bartłomiej Dach
9061ab0a27 Update/reword comments in listing overlay 2021-06-26 20:42:13 +02:00
Bartłomiej Dach
b56dd7ff25 Fix naming and xmldocs in new beatmap search result structures 2021-06-26 20:35:07 +02:00
Naxess
4b436b774d Add few hitsounds check 2021-06-26 19:20:46 +02:00
Naxess
d8117fa730 Add muted objects check 2021-06-26 19:20:34 +02:00
Gagah Pangeran Rosfatiputra
2b1d3c8e9c
add od filter in search filter 2021-06-26 21:05:01 +07:00
Gagah Pangeran Rosfatiputra
8e1bcc4d6b
add overall difficulty in filter criteria 2021-06-26 21:02:31 +07:00
Salman Ahmed
e8e9fdd533 Dispose ResourcesSkin before clearing skin sources 2021-06-26 12:34:30 +03:00
Salman Ahmed
e5eea503db Remove finalizer logic from ResourcesSkin 2021-06-26 12:21:49 +03:00
Henry Lin
3b822cd5cf Refactor SeedSettingsControl and related controls 2021-06-26 11:19:14 +08:00
Bartłomiej Dach
ea384332c3
Merge branch 'master' into logo-transition-sound 2021-06-25 21:12:48 +02:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
aitani9
6bc71590c5 Disable logo click sound when exiting 2021-06-25 09:21:26 -07:00
smoogipoo
c93c615f5e Also fix up interface names 2021-06-25 20:15:30 +09:00
smoogipoo
1ed61b9b98 Fix up dependencies class names 2021-06-25 20:11:38 +09:00
Salman Ahmed
8387acfe15
Merge branch 'master' into fix-initial-ruleset-skin-loading 2021-06-25 12:22:51 +03:00
smoogipoo
a27a647ae7 Rename RoomDependencies -> OnlinePlayDependencies 2021-06-25 18:07:47 +09:00
smoogipoo
04279e7f5c Add some xmldocs 2021-06-25 18:02:53 +09:00
smoogipoo
c0d2b41d4c Move SpectatorClient into multiplayer dependencies 2021-06-25 17:55:16 +09:00
Dean Herbert
51dd7fc238
Merge pull request #13622 from aitani9/mod-settings-dropdown-height
Decrease the max dropdown height in mod settings
2021-06-25 17:42:47 +09:00
smoogipoo
7aefbe3da1 Move UserLookupCache inside dependencies 2021-06-25 17:37:02 +09:00
Dean Herbert
5883922177 Remove mod multiplier completely 2021-06-25 16:36:31 +09:00
Salman Ahmed
f07008a0a2 Fix RulesetSkinProvidingContainer potentially late in setting up skin sources 2021-06-25 10:05:51 +03:00
Dean Herbert
57ae87956a Update execution state change blocking logic in line with framework changes 2021-06-25 15:27:40 +09:00
smoogipoo
81a812e216 Rework MultiplayerTestScene to make use of OnlinePlayTestScene 2021-06-25 15:00:10 +09:00
smoogipoo
aa5d22d04a Remove "test container", make everything go through OnlinePlayTestScene 2021-06-25 13:02:19 +09:00
Henry Lin
31c786e1c3 Use SettingsNumberBox.NumberBox instead of OsuNumberBox 2021-06-25 09:51:34 +08:00
aitani9
93edb25ace Override CreateMenu instead of using a property 2021-06-24 14:32:43 -07:00
aitani9
34ace2553e Revert "Refactor the menu's max height to be a property"
This reverts commit 9cb9ef5c
2021-06-24 14:32:00 -07:00
aitani9
62566f2a4a Remove "Score Multiplier" text 2021-06-24 14:29:47 -07:00
Bartłomiej Dach
4fe30ca923 Remove Traditional Chinese (HK) language option
Due to no actual existing translations it was falling back to Simplified
Chinese instead, making the option actively wrong/confusing.
2021-06-24 18:32:17 +02:00
smoogipoo
5820793d11 Make TestMultiplayerRoomContainer inherit TestRoomContainer 2021-06-24 21:02:29 +09:00
smoogipoo
9cf2c9ddae Fix incorrect dependency creation 2021-06-24 21:02:21 +09:00
smoogipoo
a21cf87b5f Split room manager and allow overrides 2021-06-24 19:14:05 +09:00
smoogipoo
5115299e9a Merge RoomManagerTestScene into OnlinePlaySubScreenTestScene 2021-06-24 19:09:31 +09:00
Dean Herbert
6922de12c6 Add extra null safety in dispose call 2021-06-24 17:17:12 +09:00
smoogipoo
a7b5c3bed1 Add OnlinePlaySubScreenTestScene 2021-06-24 17:01:28 +09:00
smoogipoo
9287fae5f7 Simplify 2021-06-24 16:54:09 +09:00
smoogipoo
4af119a407 Re-namespace 2021-06-24 16:29:06 +09:00
Salman Ahmed
a98b5618b8 Convert RulesetResourcesSkin to plain ResourcesSkin and pass non-null resources 2021-06-24 10:07:38 +03:00
smoogipoo
c9ec4b9da4 Remove RoomTestScene inheritance from simple test scenes 2021-06-24 16:02:20 +09:00
JimmyC7834
27735eeedb fixed code 2021-06-24 13:45:38 +08:00
Dean Herbert
63ab40ec24 Fix potential deadlocking behaviour (and convert ResetEvent to Semaphore) 2021-06-24 14:37:26 +09:00
Nathan Alo
812624a502 use .Equals() instead 2021-06-24 10:45:20 +08:00
Nathan Alo
564c72bf74 compare directly instead of comparing IDs 2021-06-24 10:10:57 +08:00
Nathan Alo
73590bfca1 Return an empty array when the sender is from system. 2021-06-24 07:20:31 +08:00
aitani9
c8022126dc Add logo sound case for transitioning to song select 2021-06-23 13:39:12 -07:00
Dan Balasescu
3a96f9bd14
Merge pull request #13637 from Game4all/localise-beatmap-listing-ruleset-filter
Localize beatmap listing ruleset filter `Any` button
2021-06-24 00:57:48 +09:00
Lucas A
263370e1ff Localize ruleset filter any filter button. 2021-06-23 16:42:14 +02:00
Dean Herbert
b6555c10f8
Merge pull request #13630 from smoogipoo/more-collection-safety
Make collection database even more safe
2021-06-23 22:07:52 +09:00
smoogipoo
8a2026e305 Schedule callback instead 2021-06-23 21:26:52 +09:00
smoogipoo
c85edd2b55 Merge branch 'master' into fix-realm-state-change-crashes 2021-06-23 21:20:53 +09:00
Dean Herbert
01a5d998a5 Update framework 2021-06-23 20:29:02 +09:00
Dean Herbert
d148656108 Update in line with framework event structural changes (and add unbind) 2021-06-23 18:08:34 +09:00
Dean Herbert
dcba7bf779 Fix import flow potentially hitting foreign key constraint 2021-06-23 17:34:56 +09:00
Dan Balasescu
b6793aadb4
Merge pull request #13628 from ekrctb/add-IApplicableToBeatmapProcessor
Add `IApplicableToBeatmapProcessor` mod interface
2021-06-23 17:08:40 +09:00
Salman Ahmed
d484469906 Handle case where SkinManager sources aren't part of AllSources
In tests.
2021-06-23 10:44:23 +03:00
Dean Herbert
28f4c56cd6 Fix minor typo in comment 2021-06-23 16:30:28 +09:00