1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 09:47:24 +08:00
Commit Graph

591 Commits

Author SHA1 Message Date
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
Dean Herbert
2938f44e6c Update PresentExternally usages in line with framework changes 2022-03-24 23:41:07 +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
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01: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
Dean Herbert
1eed2436e6 Clean up unused resolved properties 2021-12-03 18:49:49 +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
0ecf5f201c Rename User to APIUser and move to correct namespace 2021-11-07 11:26:01 +09:00
Dean Herbert
f1499641f3 Rename all usages of APIBeatmap to beatmap in tournament namespace 2021-10-27 18:42:48 +09:00
Dean Herbert
3130616300 Update tournament components to use APIBeatmap directly 2021-10-27 18:26:44 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Dean Herbert
0706ad70fb Move BeatmapSetOnlineInfo to an interface type 2021-10-21 16:58:42 +09:00
Dean Herbert
794b4c46cf Split score counter class into two distinct classes to simplify usages 2021-10-10 17:56:32 +09:00
Dean Herbert
446f091d32 Use comma separator for tournament score displays 2021-10-10 16:06:12 +09:00
Dean Herbert
672664dce7 Fix all remaining cases of incorrect Bindable<string> defaults 2021-10-08 13:55:22 +09:00
Dean Herbert
ec61c3c5ee Rename all remaining cases 2021-10-03 00:55:29 +09:00
Dean Herbert
973c31132b Rename BeatmapInfo variables which were named beatmap for clarity 2021-10-02 12:45:34 +09:00
Bartłomiej Dach
acf38c723a
Move labelled dropdown from tournament to main game 2021-08-30 21:37:08 +02:00
Dean Herbert
6ef096001e Fix several cases of incorrect handling of CurrentMatch nullability 2021-08-28 16:24:36 +09:00
Dean Herbert
e9b97f7937 Fix tournament crashing when osu!(stable) is at ranking screen at startup 2021-08-28 14:28:33 +09:00
Dean Herbert
aa4c6b9341 Bring across tournament score display for game usage 2021-08-09 16:30:37 +09:00
Dean Herbert
6249ce0ea3 Add a warning and link for more information on drawings.txt population 2021-07-30 13:21:50 +09:00
Dean Herbert
ceec74aaca Avoid throwing / logging an error when drawings.txt is missing 2021-07-30 02:00:07 +09:00
Dean Herbert
353ff5c6ce
Merge pull request #13915 from bdach/fix-tourney-seeding-crash
Fix seeding screen crashing on seedings with null mod
2021-07-18 17:47:29 +09:00
Bartłomiej Dach
32ca2b939b
Merge branch 'master' into tournament-flow-warnings 2021-07-17 18:33:45 +02:00
Bartłomiej Dach
714255e6d4 Fix seeding screen crashing on seedings with null mod 2021-07-17 18:06:47 +02:00
Bartłomiej Dach
7fabdbc504
Merge branch 'master' into schedule-display-without-current 2021-07-16 22:45:51 +02:00
Dean Herbert
e8595871de Update remaining screens to also show the warning message 2021-07-17 00:23:17 +09:00
Dean Herbert
71f74f0e98 Add warning message to screens which require a current match to be selected 2021-07-17 00:23:17 +09:00
Dean Herbert
83ebbb7f8e Allow the schedule screen to show even when a current match is not selected 2021-07-17 00:21:58 +09:00
Dean Herbert
bda16f0fbc Fix progression lines getting stuck after removing a match in ladder editor screen 2021-07-16 23:51:31 +09:00
Bartłomiej Dach
f45418dde7 Replace game-side directory/file selector with framework extensions 2021-07-06 22:11:54 +02:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
88c6143aae Rename variables in line with standards 2021-06-28 15:23:19 +09:00
Henry Lin
0cceef8da5 Moved the string to int? conversion logic into SettingsNumberBox 2021-06-28 11:00:07 +08:00
Bartłomiej Dach
5df27ce3d4 Split out score transform logic to method 2021-04-04 11:44:39 +02:00
Bartłomiej Dach
0febefd8eb Fix scores fading out on entering gameplay screen 2021-04-03 22:35:36 +02:00
Bartłomiej Dach
0d9793797f Fix scores being initially visible incorrectly in gameplay screen 2021-04-03 22:24:30 +02:00
smoogipoo
69db0a5593 Countries should not be null (internal game resource) 2021-03-30 09:03:34 +09:00
smoogipoo
804ffe9f48 Fix inspections 2021-03-30 09:00:09 +09:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dean Herbert
1ac82af19a Adjust flag size to fit again 2021-02-26 17:58:23 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Salman Ahmed
705e926749 Fix attempting to populate users with invalid IDs 2021-02-17 07:50:14 +03:00
Bartłomiej Dach
a8fa09103c Update match start text prefix in real time 2021-01-23 17:16:13 +01:00
yhsphd
c30b700b3a "started" for past matches
fixes grammar error at 'coming up next' section in schedule screen which displays schedule like "starting an hour ago" for past matches
2021-01-24 00:26:52 +09:00
Dean Herbert
f65042cf44 Add missing licence headers 2021-01-11 15:47:27 +09:00
Dean Herbert
c9466426b7 Change field to local variable 2021-01-11 14:45:01 +09:00
Dean Herbert
7a7c583ded Move setup screen classes out of single file and into their own namespace 2021-01-11 14:44:07 +09:00
Dean Herbert
bd627534b7 Use disabled state instead of hiding button 2021-01-11 14:38:51 +09:00
Dean Herbert
ba3a7a0501 Clean up code 2021-01-11 14:38:42 +09:00
Shivam
f466791b69 Move assignments to the TournamentSwitcher component
This also adds conditional checks for displaying the "Close osu!" button
2021-01-10 17:34:20 +01:00
Shivam
8e428353ee Revise TournamentSwitcher to include a close button 2020-12-26 15:44:59 +01:00
Shivam
f980f41324 Address review 2020-12-07 21:38:15 +01:00
Shivam
191f863a49 Remove unncessary words from the description 2020-12-07 13:14:59 +01:00
Shivam
eda6e1fbdd Add tournament switching in the UI 2020-12-07 13:11:13 +01:00
Dean Herbert
78c43641d1 Update imagesharp namespaces (and consume System.Drawing types instead) 2020-12-03 17:43:09 +09:00
Dean Herbert
86ef73c587
Merge pull request #10830 from Joehuu/consistent-tournament-strings
Make tournament strings more consistent
2020-11-16 16:20:49 +09:00
Bartłomiej Dach
610ed99ae3 Add null checks to unguarded resolved-as-null fields 2020-11-14 14:52:58 +01:00
Joehu
706d7890b4 Make tournaments strings more consistent 2020-11-13 13:25:45 -08:00
Dean Herbert
1e1569eb53 Use int instead of long for user_id fields for now 2020-11-06 12:59:46 +09:00
Dean Herbert
ac13a1d217 Adjust a couple of flag scales to match previous display size 2020-10-26 14:27:55 +09:00
Shivam
c24a29d1ac Update flag scale of drawablematchteam 2020-10-23 14:23:08 +02:00
Shivam
ae9e60560b Fixed gameplay flags being bigger and changed values to make more sense 2020-10-23 14:11:29 +02:00
Shivam
afa86f959f Changed scales of Seeding and Win screen to match the original
These were measured by pixel-to-pixel comparing master vs this branch in ShareX at the same resolution.
2020-10-19 23:38:06 +02:00
Shivam
1c073a9ea5 Merge branch 'master' into flag-fit 2020-10-19 22:27:48 +02:00
Dean Herbert
cc41845f56 Add missing string function ordinal specifications 2020-10-16 12:49:31 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
937d5870b3 Add a basic file selector with extension filtering support 2020-09-24 20:54:25 +09:00
Shivam
9f1a231f92 Add anchor to the fillflowcontainer in TeamDisplay 2020-09-13 21:03:46 +02:00
Shivam
7f0eaded26 Merge branch 'master' into flag-fit 2020-09-13 19:55:56 +02:00
Shivam
59dcdd41aa Merge branch 'master' into flag-fit 2020-09-13 19:55:28 +02:00
Shivam
18ae17e129 Add scale to GroupTeam and remove unnecessary sizing and scaling in other scenes 2020-09-13 19:55:21 +02:00
Dean Herbert
d3957e6155 Move title specification for settings groups to constructor
Using an abstract property was awkward for this as it is being consumed
in the underlying constructor but could not be dynamically set in time from a
derived class.
2020-09-09 18:50:31 +09:00
Dean Herbert
5195da3ceb Add message box in bracket editor explaining how to get started 2020-09-02 15:18:51 +09:00
Shivam
d9ba677773 Change TeamFlag from sprite to a container with a sprite 2020-08-24 15:08:50 +02:00
Salman Ahmed
ee9fa11d14 Use With(s => ...) extension for better readability 2020-08-19 07:47:02 +03:00
Salman Ahmed
9d10658e3c Allow providing custom sprite text for RollingCounter<T> 2020-08-03 20:14:17 +03:00
Salman Ahmed
5f52701273 Remove no longer necessary custom dropdown 2020-08-01 10:11:34 +03:00
Shivam
d98a64dfbc Make seeding # bg black and white text color
Makes it consistent with TournamentSpriteTextWithBackground
2020-07-08 03:29:14 +02:00
Bartłomiej Dach
51bbd91373 Bring back initial directory behaviour 2020-06-13 19:28:21 +02:00
Bartłomiej Dach
5dd47bf393 Remove unnecessary members 2020-06-13 16:03:34 +02:00
Bartłomiej Dach
e0518fd451 Fix silent failure 2020-06-13 15:38:29 +02:00
Bartłomiej Dach
992aa0041e Allow auto-detect to work after choosing manually 2020-06-13 15:27:46 +02:00
Bartłomiej Dach
586d5791e0 Remove unused argument 2020-06-13 15:07:41 +02:00
Bartłomiej Dach
1cd96b8002 Rework StableInfo into a DI'd data structure 2020-06-13 15:06:07 +02:00
Bartłomiej Dach
5f79feaa8b Merge branch 'master' into custom-ipc-location 2020-06-13 13:41:59 +02:00
Dean Herbert
3ae1df07b0 Fix a couple more new formatting issues 2020-06-10 00:09:29 +09:00
Dean Herbert
7dc19220e5 Apply new resharper formatting fixes 2020-06-09 23:38:54 +09:00
Shivam
7e5db5e933 Apply review suggestions 2020-06-03 23:49:06 +02:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Dean Herbert
78fddc8957 Make button match height 2020-06-02 19:29:59 +09:00
Dean Herbert
828180ad9b Add default 2020-06-02 19:29:22 +09:00
Shivam
fea5c8460a Fixed path is empty exception
Also converted method to property get, private set
2020-06-01 22:50:24 +02:00
Shivam
33d731644c Fix test crashing: NullReferenceException 2020-05-31 17:35:53 +02:00
Shivam
ce360a960f use GameHost's GetStorage instead of local storage
This will now get the IPC Path again as the default path if one is present, else it will fall back to osu! lazer's base path.
2020-05-31 16:50:13 +02:00
Shivam
0027f44bd0 Moved stableInfo read to FileBasedIPC
DI is also not needed anymore to access StableInfo, this goes through FileBasedIPC.
Note: directory selector now always navigates to the osu! lazer base path.
2020-05-31 16:27:05 +02:00
Shivam
3731e76b10 Move stable_config declaration, rename testscene 2020-05-28 15:28:27 +02:00
Bartłomiej Dach
748f7fcd8b Rename constants 2020-05-25 20:20:26 +02:00
Bartłomiej Dach
ca68d94cf7 Invert if to reduce nesting 2020-05-25 20:18:17 +02:00
Bartłomiej Dach
719da48922 Rename delegate argument 2020-05-25 20:11:00 +02:00
Shivam
4c3900cfc8 Remove unnecessary comments, simplify initialPath and clarified TestScene name 2020-05-25 17:16:40 +02:00
Olle Kelderman
a174117880 fix flowcontainer order properly and removed todo as its decided to do nothing there for now 2020-05-25 00:55:10 +02:00
Olle Kelderman
1062e07ec1 refactor and implemented feedback:
- button text change
- renamed ActionableInfoWithNumberBox to ResolutionSelector and moved the clamping logic inside it
- also removed the ugly right margin and added the FillFlowContainer
2020-05-24 22:24:46 +02:00
Shivam
c6345ba6c9 corrected styling issues 2020-05-22 20:01:26 +02:00
Shivam
0717dab8e4 Add StablePathSelectScreen visual test 2020-05-22 19:51:08 +02:00
Olle Kelderman
554be1c422 add the ability to set the size of the Tournament Client to an arbitrary value instead of a fixed 1080p option 2020-05-22 19:25:05 +02:00