1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 02:17:46 +08:00
Commit Graph

841 Commits

Author SHA1 Message Date
Dean Herbert
d77b6b3603 Fix seeding screen buttons crashing the game if no match is selected 2022-11-07 19:04:06 +09:00
Dean Herbert
64f9d6c891 Fix potential cross-thread drawable operation in round editor screen 2022-11-07 19:03:56 +09:00
Dean Herbert
de2dac22b8 Ensure seeding screen is refreshed on entering 2022-11-07 18:46:04 +09:00
Dan Balasescu
fa18b5f701 Construct notifications client inside ChannelManager 2022-11-04 18:51:00 +09:00
Dean Herbert
ec4ac77f14 Increase the maximum seed range for tournament client 2022-11-03 13:27:54 +09:00
Dan Balasescu
58c6b026ae Remove unused using 2022-11-02 15:23:11 +09:00
Dan Balasescu
fe66b20702 Fix one more case of constructing connector directly 2022-11-02 15:22:46 +09:00
Dean Herbert
17f482bfc3
Merge branch 'master' into websocket-chat-2 2022-10-31 16:11:58 +09:00
Dan Balasescu
169bcc2654 Use polling connector in tests 2022-10-28 18:08:08 +09:00
Dan Balasescu
2f731f86ba Adjust ChannelManager to use notifications client 2022-10-28 16:28:58 +09:00
Dean Herbert
29f504ecc0 Remove obsoleted tournament migration flow 2022-10-28 13:04:56 +09:00
Dean Herbert
14704fd07c Fix crash when exiting seeding editor too soon
Closes https://github.com/ppy/osu/issues/20783.
2022-10-24 16:08:50 +09:00
Dean Herbert
889c2978d7 Fix point conversion not using invariant culture
This was only the case in a fallback path (ie. when the user provides a
`json` file with an old or computed format from an external source).

Closes #20844.
2022-10-24 13:15:00 +09:00
Dean Herbert
9e42d6167f Fix tournament match scores resetting if StartMatch is called on an in-progress match 2022-09-08 16:07:21 +09:00
Dan Balasescu
dbdb311f79
Merge pull request #20094 from peppy/tourney-fix-team-display-scores
Show team scores at the tournament map pool screen
2022-09-07 14:58:14 +09:00
Dan Balasescu
c42ae4be04
Merge pull request #20095 from peppy/fix-bracket-riht-click-no-selection
Fix right-clicking a non-selected match in ladder view dismissing context menu
2022-09-07 14:56:23 +09:00
Salman Ahmed
b43995269a Dispose ScrollingTeams on removal 2022-09-03 15:17:51 +03:00
Dean Herbert
8d6739ae73 Show team scores at the tournament map pool screen 2022-09-02 18:29:02 +09:00
Dean Herbert
8bfaa2a51f Fix tournament match handling right click to select itself, dismissing the context menu 2022-09-02 18:19:42 +09:00
Dean Herbert
6a35b233e5 Merge branch 'master' into remove-dispose-updates 2022-09-01 23:03:19 +09:00
Dean Herbert
d3ae60ec6d Fix tournament population failure when beatmap is not found on server 2022-09-01 22:03:01 +09:00
Dean Herbert
93bc4b9294 Add toggle for tournament client "auto progression" behaviour
Addresses https://github.com/ppy/osu/discussions/20038.
2022-08-31 13:44:07 +09:00
Dean Herbert
a215d009fe Update Remove/RemoveRange/RemoveAll calls in line with framework changes 2022-08-29 15:57:40 +09:00
Dean Herbert
ef10145d6f Rename MenuCursorContainer and clean up code 2022-07-26 14:11:52 +09:00
Dean Herbert
caa44ce01e Update naming 2022-07-18 16:40:11 +09:00
Dean Herbert
d909a1fd46 Merge branch 'master' into remove-countries-json 2022-07-18 16:38:53 +09:00
Salman Ahmed
018da74fe8 Replace default with CountryCode.Unknown 2022-07-18 08:54:35 +03:00
Salman Ahmed
100c53f9ef Country -> CountryCode 2022-07-18 08:40:34 +03:00
Salman Ahmed
a10c398cd5 Remove no longer necessary DI 2022-07-16 06:40:53 +03:00
Salman Ahmed
7c6f4b798b Replace countries.json with country enum and acronym extension 2022-07-16 05:16:59 +03:00
Salman Ahmed
b2b2a4adaf Update tournament migration logic to check for null Country 2022-07-16 05:04:24 +03:00
Salman Ahmed
2734a28115
Merge branch 'master' into tourney-save-changes-button-ux 2022-07-14 04:37:03 +03:00
Salman Ahmed
24df8f6a0d Enable NRT on save changes button 2022-07-14 04:33:07 +03:00
Salman Ahmed
776d9551e2 Disable "save changes" button by default 2022-07-14 04:16:25 +03:00
Dan Balasescu
b6528b9ff7
Merge pull request #19102 from peppy/fix-ladder-editor-commit-on-selection-change
Ensure any changes are committed before changing `LadderEditorSettings`'s target match
2022-07-13 22:06:10 +09:00
Dean Herbert
467f83b603 Add non-null assertion missing in BeatmapScoreRow 2022-07-13 18:48:12 +09:00
Dean Herbert
214351a87e Ensure any changes are committed before changing LadderEditorSettings's target match 2022-07-13 18:32:47 +09:00
Dean Herbert
5c6fa2341f Fix TeamScoreDisplay not tracking team changes properly 2022-07-13 18:15:59 +09:00
Dean Herbert
1516756d8b Fix team name not updating on TeamDisplay immediately 2022-07-13 18:10:27 +09:00
Dean Herbert
4dff999ce6 Fix potential null referenced in SeedingScreen
Also ensure that any update operations only occur when the seeding
screen is displayed. They were running in the background until now.
2022-07-13 18:09:55 +09:00
Dean Herbert
b9ad90ce54 Switch TeamWinScreen scheduling to AddOnce 2022-07-13 17:57:45 +09:00
Dean Herbert
11c8a2c16e Disable tournament client "save changes" button when there's no changes to save 2022-07-13 17:46:09 +09:00
Dean Herbert
bae314a254 Add background on SetupScreen to hide video 2022-07-12 13:03:43 +09:00
Dean Herbert
76be9a829c Fix mutation after disposal in TeamEditorScreen 2022-07-12 12:59:55 +09:00
Dean Herbert
73e924479f Find video by recursive check rather than marker interface
Seems a lot more reliable, and allows falling back to the "main" video
in cases which didn't support this previously.

A next step may be to allow every screen to support a video based on its
screen name, rather than specifying the local `TourneyVideo` every time.
2022-07-11 20:42:05 +09:00
Dean Herbert
00c7101f54 Remove DrawingsScreen world map completely 2022-07-11 20:36:05 +09:00
Dean Herbert
22a51fdc50 Add support for a drawings screen video background 2022-07-11 15:35:00 +09:00
Bartłomiej Dach
a83c45b50e
Fix compile failures from framework breaking change 2022-06-24 16:07:14 +02:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
Dean Herbert
50e40756c4 Rename GracefullyExit to AttemptExit 2022-06-19 12:34:44 +09:00
Dean Herbert
f3c9f9a216
Merge pull request #18751 from frenzibyte/tournament-beatmap
Improve tournament beatmap JSON storage using lightweight model
2022-06-18 11:00:26 +09:00
Salman Ahmed
4c47996130 TournamentPlayer -> TournamentUser 2022-06-18 02:33:26 +03:00
Salman Ahmed
60903be566 Standardise naming for online ID
Rather than continuing with `ID` or `Id`, this should follow the new
standards and use `OnlineID` instead. Only updating this since it's a
newly introduced class.
2022-06-18 01:48:16 +03:00
Salman Ahmed
9f97d1a7db Replace tournament beatmap storage type with lightweight model 2022-06-18 01:34:09 +03:00
Salman Ahmed
200b23c689 Add lightweight TournamentBeatmap model 2022-06-18 01:30:56 +03:00
Salman Ahmed
b977ce7995 Replace tournament player storage type with lightweight model 2022-06-17 21:35:04 +03:00
Salman Ahmed
f3793c8809 Add lightweight TournamentPlayer model 2022-06-17 21:35:04 +03:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Bartłomiej Dach
f88c568c8d
Update flag sizes after switch to twemoji assets
The old flags used a size of 150x100, while the new assets based on
twemoji use a size of 150x108. Update existing usages to match this new
aspect ratio better.
2022-06-15 21:45:47 +02:00
Dean Herbert
c661f2b059 Ensure ChannelManager has access to API from point of construction
Closes https://github.com/ppy/osu/issues/18451.
2022-06-08 19:15:23 +09:00
Dean Herbert
afbb1fa750 Fix tournament user stat population potentially using wrong ruleset
`OsuGameBase.Ruleset` is bound
[late](7d0470794b/osu.Game.Tournament/TournamentGameBase.cs (L169))
so we must use the ladder one during user retrieval.

Closes https://github.com/ppy/osu/issues/18363.
2022-05-23 14:07:11 +09:00
Dean Herbert
218642c300 Update unsafe file write usages 2022-05-16 18:05:27 +09:00
Dan Balasescu
494955aff1 Resolve inspection issues 2022-04-14 13:11:11 +09:00
Dean Herbert
ea672745b0 Add ability to switch between most common tournament scenes using key bindings 2022-04-01 12:44:49 +09:00
Dean Herbert
a06b0a4966 Fix tournament bracket parsing's ruleset refetch logic not working correctly
Due to equality being based on `ShortName`, it was feasible that the
re-fetch exited early (in bindable shortcutting logic) causing the
ruleset's `OnlineID` to remain `-1` or something equally wrong.

Resolves issue pointed out at
https://github.com/ppy/osu/discussions/17538#discussioncomment-2471746.
2022-03-31 18:41:00 +09:00
Dean Herbert
a7a7584d3e Add test coverage ensuring ruleset ID is correct after bracket read
Historically, tournament client may have written incorrect `OnlineID`
values. We wanted to use `ShortName` to re-fetch the ruleset. This test
ensures this flow is working correctly.
2022-03-31 18:39:58 +09:00
Dean Herbert
2938f44e6c Update PresentExternally usages in line with framework changes 2022-03-24 23:41:07 +09:00
Dean Herbert
df4170b939 Display star ratings in tournament mode using two decimal places 2022-02-27 23:17:04 +09:00
Dean Herbert
297e5ec62e Remove unused constants 2022-02-27 23:16:04 +09:00
Shivam
4c56458173 Change button location to the right side of dropdown 2022-02-25 15:15:40 +01:00
Shivam
333c0cd4f9 Add open folder button to open currently selected tournament 2022-02-25 14:31:46 +01:00
Dean Herbert
44f2d8a448 Allow game folder migration to fail gracefully when cleanup cannot completely succeed 2022-02-10 19:30:26 +09:00
Bartłomiej Dach
9deeaee404
Fix tournament client not loading
Caused by a `LoadComponentsAsync()` call being fired from a worker
thread, which will throw exceptions since the recent addition of safety
checks around that method.
2022-01-27 17:31:12 +01:00
Dean Herbert
5288eedd31 Update all usages of RulesetID and Ruleset.ID to use Ruleset.OnlineID 2022-01-27 15:38:03 +09:00
Salman Ahmed
b2d1bd029d Turn on high poll rate when tournament chat is expanded 2022-01-22 16:34:57 +03:00
Bartłomiej Dach
03e4ec4214
Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-15 14:45:42 +01:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
b5f670cc5b Add far too many fixes for ruleset non-nullable requirements 2022-01-12 23:24:11 +09:00
Dean Herbert
51251e3204 Fix CI reported warnings 2022-01-12 22:39:00 +09:00
Joseph Madamba
5082b0e63f Fix some identifiers using shortened naming 2021-12-27 20:26:28 -08:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
38702beabf
Merge branch 'master' into i-ruleset-store 2021-12-04 15:05:39 +01:00
Dean Herbert
1eed2436e6 Clean up unused resolved properties 2021-12-03 18:49:49 +09:00
Dean Herbert
e75e209053 Cache and consume IRulesetStore where feasible 2021-12-03 18:16:01 +09:00
Dean Herbert
5158736839 Avoid saving bracket if parsing failed, at all costs 2021-12-03 16:06:38 +09:00
Dean Herbert
ba05a0a383 Centralise specification of bracket.json filename 2021-12-03 16:04:11 +09:00
Bartłomiej Dach
87d6a743dd
Migrate custom tournament client assets to uppercased directories
It has transpired that on filename-case-sensitive filesystems, the
tournament client does not consistently handle custom asset paths.
Videos and mods could only be looked up from `videos` and `mods`
directories (lowercase), while flags could only be looked up from the
`Flags` directory (uppercase).

A complicating circumstance is that default country flags, coming from
osu-resources, also depend on the flag lookup being uppercased.

To attempt to clean up the handling as much as it appears to be
possible, automatically move user-supplied lowercase directories to
uppercase.
2021-11-28 16:36:19 +01:00
Dean Herbert
bbd3ea5b77 Update all actual usages of RulesetInfo.ID to use OnlineID instead 2021-11-24 15:50:26 +09:00
Dean Herbert
86540d1fb6 Update existing usages of Author as string to access Username directly 2021-11-04 18:57:54 +09:00
Dean Herbert
b9983add15 Rename User to APIUser and move to correct namespace 2021-11-04 18:21:31 +09:00
Dean Herbert
10a9266956 Fix beatmap creator showing twice in tournament map pool panels 2021-11-01 14:33:24 +09:00
Dean Herbert
6f5040722a Merge branch 'master' into beatmap-refactor/uncontested 2021-10-28 16:37:26 +09:00
Dan Balasescu
f9ca7f5df1
Merge pull request #15319 from peppy/beatmap-refactor/tournament
Remove all usage of `BeatmapInfo` / `BeatmapSetInfo` from tournament mode
2021-10-28 16:26:06 +09:00
smoogipoo
313f78cbfb Fix non-null inspection 2021-10-28 15:24:44 +09:00
Dean Herbert
a6669a3892 Add mention of why the serialisation happens outside stream usage 2021-10-28 15:04:09 +09:00
Dean Herbert
ef26b0ba8a Fix serlialisation failure during ladder saving causing all existing file content to be deleted 2021-10-28 15:00:30 +09:00
Dean Herbert
f3d208fecf Remove TODO (tested to work correctly) 2021-10-28 14:48:36 +09:00
Dean Herbert
7245baba69 Remove IBeatmapSetOnlineInfo implementation from BeatmapSetInfo to avoid null cases 2021-10-28 00:50:45 +09:00
Dean Herbert
f1499641f3 Rename all usages of APIBeatmap to beatmap in tournament namespace 2021-10-27 18:42:48 +09:00