1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 16:22:21 +08:00
Commit Graph

984 Commits

Author SHA1 Message Date
Bartłomiej Dach
3ccd0ca1b0
Merge branch 'master' into tournament-resolution-fixes 2023-07-24 21:27:20 +02:00
Bartłomiej Dach
3af5c2b4f3
Merge pull request #24349 from peppy/tournament-bindable-fixes
Fix tournament client crashing occasionally when editing bracket
2023-07-24 21:21:39 +02:00
Dean Herbert
4fdf885959 Fix crash when switching ladder match selection multiple times 2023-07-25 01:46:45 +09:00
Dean Herbert
e0c0797f55 Fix dodgy implementation of current bindable in DateTextBox 2023-07-25 01:46:45 +09:00
Dean Herbert
62121ea14c Add non-black background to right of tournament system 2023-07-25 01:44:32 +09:00
Dean Herbert
b7f706ad2b Set a fixed minimum window size for the tournament client 2023-07-25 01:44:32 +09:00
Dean Herbert
e46385ee6a Automatically select new match in ladder editor after adding 2023-07-25 01:39:56 +09:00
Dean Herbert
dd32b771cf Adjust borders/layout to better align with grid 2023-07-25 01:39:56 +09:00
Dean Herbert
fd1bd0c88a Add grid to show ladder editor snapping 2023-07-25 01:39:56 +09:00
Dean Herbert
b1484e6973 Improve bracket selection box visuals
Fix border around selected match being uneven
2023-07-25 01:39:56 +09:00
cdwcgt
fd4d3a6d66
Use DelayedLoadWrapper to avoid beatmap cover unload in map pool 2023-07-25 00:52:02 +09:00
Dao Heng Liu
7813a3162b
run stateChanged upon unhiding of GameplayScreen 2023-07-23 15:12:11 +01:00
Dao Heng Liu
5a568eacb6
remove unused using directive 2023-07-23 10:44:00 +01:00
Dao Heng Liu
3049d159d8
avoid potentially cancelling contract when switching away from GameplayScreen 2023-07-23 10:39:47 +01:00
Dean Herbert
7e4e96a4a9 Adjust spacing and clean up code 2023-07-23 17:05:04 +09:00
Dean Herbert
3b47949ace Avoid transform overhead on every frame 2023-07-23 17:04:57 +09:00
cdwcgt
1a76f6441a
add MatchScoreDiffCounter
Intuitively show the score difference between the two teams
2023-07-23 15:33:40 +09:00
Dao Heng Liu
647f2b6715
fix auto advance screens sometimes not working 2023-07-22 23:08:20 +01:00
Dean Herbert
0170894d18
Merge pull request #24327 from ILW8/tourney-reload-tourneys-list
Add reload tournaments list button to tourney setup screen
2023-07-22 21:04:12 +09:00
Dean Herbert
a59876ce13 Remove unnecessary enable call 2023-07-22 21:03:13 +09:00
Dean Herbert
101f3eca25 Rename button slightly 2023-07-22 21:01:32 +09:00
Dao Heng Liu
ef74084a2e
make list of tournaments in SetupScreen dropdown alphabetically sorted 2023-07-22 09:59:00 +01:00
Dao Heng Liu
e0fe5c77d5
add reload tournaments list button to tourney setup screen 2023-07-22 09:44:02 +01:00
Bartłomiej Dach
92c40c9ced
Remove superfluous container 2023-07-21 21:20:28 +02:00
Bartłomiej Dach
d055d16ba7
Remove superfluous CanBeNull dependency specs
As stated before, not required in NRT-annotated files if auto-properties
are already marked nullable.
2023-07-21 21:19:40 +02:00
Bartłomiej Dach
7ace50f442
Touch up dialogs a bit 2023-07-21 21:17:14 +02:00
Bartłomiej Dach
f197703fe1
Merge branch 'master' into tourney-dangerous-action-confirm 2023-07-21 21:13:48 +02:00
Dean Herbert
cfcfe20221 Reduce scale and better align user panel 2023-07-21 15:46:28 +09:00
Dean Herbert
9d71e8f20d Merge branch 'master' into tournament-team-editor-improvements 2023-07-21 15:30:02 +09:00
Dao Heng Liu
bf9c25f429 add confirmation dialog to delete team/round buttons in tourney editor screens 2023-07-20 23:28:31 +01:00
Dao Heng Liu
2825671e28 pass action instead of storage to TournamentClearAllDialog 2023-07-20 23:01:14 +01:00
Dao Heng Liu
3c05246baf fix weird handling of dialogOverlay in tourney client 2023-07-20 22:52:02 +01:00
Dao Heng Liu
fa480cc27b remove #nullable disable, pass action instead of container to DangerousActionDialog 2023-07-20 22:52:02 +01:00
Dao Heng Liu
68495c937d fix ResetBracketTeams tests
also fixes formatting and var naming issues
2023-07-20 22:52:02 +01:00
Dao Heng Liu
e67253ed1e remove unused code 2023-07-20 22:52:02 +01:00
Dao Heng Liu
e3a7b6969a add confirmation dialog for Clear All button in TournamentEditorScreen 2023-07-20 22:52:02 +01:00
Dao Heng Liu
41638ff4b7 move LadderResetTeamsDialog.cs into editor screens components 2023-07-20 22:52:02 +01:00
Dao Heng Liu
e7795296e2 refactor LadderResetTeamsDialog.cs 2023-07-20 22:52:02 +01:00
Dao Heng Liu
2833497e5b add dialogoverlay to tournament client, confirmation dialog for resetting bracket teams 2023-07-20 22:52:00 +01:00
Dean Herbert
f0cec04619 Fix nullability warning 2023-07-21 03:47:32 +09:00
Dean Herbert
97e572d4da Make dragging ladder more snappy 2023-07-21 03:34:41 +09:00
Dean Herbert
fb4eaaeae9 Add grid snapping to ladder editor 2023-07-21 03:34:41 +09:00
Dean Herbert
ca14b4a35f Move ladder editor controls to control panel 2023-07-21 03:34:41 +09:00
Dean Herbert
ac6a103721 Add masking around ladder view 2023-07-21 03:34:41 +09:00
Dean Herbert
f9742c3c34 Increase button size of setup screen buttons 2023-07-21 03:34:36 +09:00
Dean Herbert
cfc4575490 Fix save changes button gone somewhere else 2023-07-21 03:34:36 +09:00
Dean Herbert
427045fdaf Further layout improvements to TeamEditorScreen 2023-07-21 03:34:36 +09:00
Dean Herbert
b712b19539 Update all tournament buttons to use new design 2023-07-21 03:34:36 +09:00
Dean Herbert
0284fa1fc1 Tidy up TeamEditorScreen 2023-07-21 03:34:36 +09:00
Dean Herbert
a16d7e6cc5 Add more padding around editor screen content 2023-07-21 03:34:36 +09:00
Dean Herbert
b40532dde1 Fix tournament bracket parsing regression
Closes #24136.
Regressed in #24037.
2023-07-06 17:17:17 +09:00
Dean Herbert
34f53965c4 Never remove significant digits from stsar rating displays
Closes https://github.com/ppy/osu/issues/24079.
2023-06-29 13:55:04 +09:00
Dean Herbert
719ac75ad2
Merge pull request #24037 from cdwcgt/tournament-beatmapcache
Use beatmap cache to populate beatmap information in tournament client
2023-06-26 14:55:05 +09:00
cdwcgt
1b671b8c6e
Use GetResultSafely() 2023-06-26 00:45:59 +09:00
Bartłomiej Dach
88fbc3094a
Merge branch 'master' into chatdisplay-fix 2023-06-25 17:39:45 +02:00
Bartłomiej Dach
7d9d7066cd
Remove no-longer-needed BDL permitNulls spec 2023-06-25 17:39:15 +02:00
Bartłomiej Dach
9862992af0
Use alternative guard
Early-returning from ctors feels pretty bad. Also saves on some
nested accesses.
2023-06-25 17:37:05 +02:00
cdwcgt
14e26d2a85
use BeatmapCache for populate beatmap information 2023-06-25 22:57:39 +09:00
cdwcgt
e02a06e3e5
Revert "remove #nullable disable in LadderInfo"
This reverts commit 0dced46100.
2023-06-25 22:47:36 +09:00
cdwcgt
a3cd0d14a3
null guard for Current Match in MatchMessage 2023-06-25 20:46:58 +09:00
cdwcgt
0dced46100
remove #nullable disable in LadderInfo 2023-06-25 20:46:55 +09:00
Bartłomiej Dach
a7202721ff
Merge branch 'master' into no-confirmation-on-update-restart 2023-06-25 13:35:21 +02:00
Bartłomiej Dach
e3a89a6273
Fix remaining obvious CI inspections 2023-06-24 16:07:01 +02:00
Bartłomiej Dach
caf5673b68
Revert nullability enables in tournament client
Not trivial to fix right now and I'm not fixing in a 1k-line changeset.
2023-06-24 16:05:19 +02:00
Dean Herbert
2bda63c2c8 Merge branch 'master' into mass-nrt 2023-06-24 09:59:15 +09:00
Salman Ahmed
c5771912db
Merge branch 'master' into tournament-chatcolor 2023-06-23 22:23:33 +03:00
Dean Herbert
df5b389629 Manual fixes to reduce warnings to zero 2023-06-24 01:52:53 +09:00
Dean Herbert
0ab0c52ad5 Automated pass 2023-06-24 01:00:03 +09:00
Dean Herbert
c3f772f0da Add method to queue a restart after app is exited (when supported) 2023-06-21 19:06:28 +09:00
Salman Ahmed
90a5c75474 Add setting to ladder info and simplify changes 2023-06-14 10:03:13 +03:00
cdwcgt
2da8335da2
let team member color match their team color 2023-06-12 22:11:06 +09:00
yhsphd
82b7e570cd Add a checkbox to toggle line breaking for each mod in mappool screen 2023-06-11 22:43:06 +09:00
Salman Ahmed
62cb6a98ca Remove redundant nullable suppression directives 2023-06-07 08:20:41 +03:00
Dean Herbert
540b38dc21 Fix tournament interface save button not usable after changing match progression/round 2023-03-23 14:01:19 +09:00
Dean Herbert
0fb12508f0 Fix incorrect async continuation causing tournament client to not enable save button 2023-01-21 11:28:56 +09:00
Dean Herbert
154c258248 Fix TournamentGameBase calling AddInternal 2023-01-20 23:53:30 +09:00
Bartłomiej Dach
bb4d520500
Merge branch 'master' into tournament-always-use-production-endpoint 2023-01-17 19:46:48 +01:00
Bartłomiej Dach
7dbbb7caa2
Merge branch 'master' into tournament-fix-save-changes-on-population 2023-01-17 18:49:08 +01:00
Dean Herbert
74bb44e05d Fix player rank data not being re-fetched after a tournament's ruleset is changed 2023-01-17 19:00:31 +09:00
Dean Herbert
68636aeaaa Fix tournament client not saving changes after populating new data 2023-01-17 18:56:15 +09:00
Dean Herbert
26cd70f2bf Always use production (non-experimental) endpoints for tournament client 2023-01-17 18:46:06 +09:00
Berkan Diler
182f36c434 Use StringSplitOptions.TrimEntries for string.Split() when possible 2022-12-27 09:41:58 +01:00
Berkan Diler
c7ca4bbba5 Use generic Enum methods 2022-12-26 20:36:39 +01:00
Berkan Diler
08d2fbeb8e Use new ArgumentNullException.ThrowIfNull throw-helper API 2022-12-22 21:27:59 +01:00
Dean Herbert
4a7d7c6ed9 Use MaxBy in all locations that can and update inspection level to match dotnet-build 2022-12-19 16:47:10 +09:00
Dean Herbert
192536643c Fix some more inspections 2022-12-16 20:21:19 +09:00
Dean Herbert
27c497145f Fix the MOTHERLOAD of undetected issues that are now visible thanks to net6.0 2022-12-16 18:16:26 +09:00
Dean Herbert
d6cae991da Update netstandard2.1 references to net6.0 2022-12-16 17:16:13 +09:00
Bartłomiej Dach
894ef15e79
Merge branch 'master' into update-framework 2022-11-26 16:19:36 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
53b03df93d Combine TriangleButton and RoundedButton classes 2022-11-24 16:26:57 +09:00
Dean Herbert
19876ca0fb
Merge branch 'master' into websocket-chat-2 2022-11-11 23:53:42 +09:00
Dean Herbert
1e2e0dea74 Ensure seeding results get beatmaps populated if BeatmapIno model is null 2022-11-07 19:04:19 +09:00
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