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

600 Commits

Author SHA1 Message Date
Dean Herbert
7d5305c5e8
Merge branch 'master' into tourney-fix-screen-auto-switch 2023-07-25 17:18:43 +09:00
Dean Herbert
c84381d802 Separate out each type of scheduled operation and refactor tidy-up code 2023-07-25 17:18:13 +09:00
Dean Herbert
d41fb98350 Fix misalignment of selection box on schedule screen 2023-07-25 16:32:48 +09:00
Dean Herbert
718d94a937 Fix typo in xmldoc 2023-07-25 14:51:51 +09:00
Bartłomiej Dach
e3560d2a10
Fix uneven spacing on match connectors in tournament ladder screen
Noticed in passing during review of #24347.
2023-07-24 23:39:01 +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
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
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
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
e0fe5c77d5
add reload tournaments list button to tourney setup screen 2023-07-22 09:44:02 +01: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
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
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
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
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
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
74bb44e05d Fix player rank data not being re-fetched after a tournament's ruleset is changed 2023-01-17 19:00:31 +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
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
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
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
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
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
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
caa44ce01e Update naming 2022-07-18 16:40:11 +09: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
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
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
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
b977ce7995 Replace tournament player storage type with lightweight 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
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