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

982 Commits

Author SHA1 Message Date
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
Dean Herbert
5448b94039 Change repopulation rules to cover the fact that the serisalisation model has changed
This also adds a progress display to show how repopulation is going. It
can take a while on a large bracket.
2021-10-27 18:42:48 +09:00
Dean Herbert
35168948fe Fix PopulateUser not populating immediately when immediate is specified (due to scheduling) 2021-10-27 18:26:44 +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
7111f58bfe Fix tournament client silently failing on error during parsing 2021-10-25 16:49:33 +09:00
Dean Herbert
7c99193ada Add tournament LadderInfo serialisation tests 2021-10-25 16:49:33 +09:00
Dean Herbert
32d01f022f Rename usages which rely on online backing 2021-10-21 16:58:42 +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
42d3fe8f02 Merge branch 'master' into fix-SettingsTextBox-using-null-as-default 2021-10-08 13:37:28 +09:00
Dan Balasescu
4bbff2ebf7
Merge branch 'master' into new-interfaces 2021-10-06 11:38:17 +09:00
Dean Herbert
b41fa41c85 Rename APIRequest.Result to Response 2021-10-05 14:28:56 +09:00
Dean Herbert
1d99bc280f Merge branch 'master' into new-interfaces 2021-10-04 20:42:40 +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
Susko3
6d6fda8337 Fix some usages of SettingsTextBox using a bindable with null as default 2021-10-01 19:55:22 +02:00
Dean Herbert
05996cc2e9 Add changes that got forgotted in branch surgery 2021-10-01 17:04:53 +09:00
Dean Herbert
cf633973a9 Refactor exposed mod retrieval methods for better safety 2021-09-10 11:09:13 +09:00
Dean Herbert
2edb851008 Add ability to lookup mod from a type specification 2021-09-09 16:50:59 +09:00
Dean Herbert
4d0530ca9d Add new methods to ruleset for quicker mod lookups 2021-09-09 16:46:14 +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
e08b1223ab Move team colours to OsuColour 2021-08-09 16:30:37 +09:00
Dean Herbert
081dafc4e4 Update existing inline usages to use new extension method 2021-07-31 16:46:02 +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
fc66476107 Merge branch 'master' into dont-throw-on-missing-drawings 2021-07-30 13:10:03 +09:00
Dean Herbert
77b354bfba Resolve ruleset from store after loading tournament ladder 2021-07-30 02:12:03 +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
0a13e033ea Move height warning to bottom of screen to avoid overlap 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
ae71389ebe Ignore possible nulls from stream reader in IPC
Any failures will be caught. They're not logged, but they also weren't
before. Error handling can be improved at a future date, this series of
changes is primarily intending to unblock a new inspection.
2021-05-15 00:09:34 +02:00
Dean Herbert
b5954a55ad Remove empty <returns> xmldoc 2021-04-12 17:46:14 +09:00
Dean Herbert
879b1ab046 Avoid unnecessary casts 2021-04-04 21:58:27 +09:00
Shivam
4ee8224f8b change naming to be less confusing 2021-04-04 14:31:08 +02:00
Shivam
5f1f8ec0ef Fix IPC Source getting read from the incorrect location 2021-04-04 14:10:07 +02: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
Dean Herbert
d51f4e108e
Merge pull request #12213 from MiraiSubject/ipc-directory-regression 2021-03-30 13:15:18 +09: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
Shivam
badf5ee4a2 Fix stable.json file directory location due to the change of how TournamentStorage works 2021-03-29 15:03:10 +02:00
Dean Herbert
5ad8dc316f Add inline comment and improve linq robustness 2021-03-24 14:09:15 +09:00
Shivam
d17c431faf Disable relative mode for TournamentGame 2021-03-23 23:22:17 +01:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Salman Ahmed
51a5652666 Refetch tournament users on null country rank 2021-03-01 22:42:53 +03:00
Dean Herbert
1ac82af19a Adjust flag size to fit again 2021-02-26 17:58:23 +09:00
Dean Herbert
e82eaffaed Flip order back to original for romanisable strings 2021-02-25 14:14:07 +09:00
Dean Herbert
63d48f0c7d Fix incorrect unicode/romanised string order 2021-02-25 14:06:29 +09:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
b68dbbceff
Merge branch 'master' into multiplayer-participant-rank 2021-02-19 13:16:44 +09:00
Salman Ahmed
61bf9a64bb Revert failed user requests changes with returning user ID instead 2021-02-17 11:22:03 +03:00
Salman Ahmed
a845e96b7a Replace Ranks.Global completely with a GlobalRank property 2021-02-17 08:52:04 +03:00
Salman Ahmed
85ebc8e06c Fix potentially overwriting user ID from failed request 2021-02-17 07:50:14 +03:00
Salman Ahmed
705e926749 Fix attempting to populate users with invalid IDs 2021-02-17 07:50:14 +03:00
Salman Ahmed
3b4e02e5c7 Fix user population not immediate on bracket loading 2021-02-17 07:50:14 +03:00
Dean Herbert
7d057ab6ce Fix two threading issues 2021-02-12 22:38:55 +09:00
Dean Herbert
725db56837 Add loading spinner while tournament bracket is loading / retrieving data 2021-02-12 16:55:34 +09:00
Dean Herbert
81ab82fafe Tidy up nesting 2021-01-26 19:16:38 +09:00
Dean Herbert
64a3c712aa Rename class and add xmldoc 2021-01-26 19:15:19 +09:00
Dean Herbert
a5f3418e56 Avoid tooltip display 2021-01-26 19:11:19 +09:00
Shivam
b036f0165a move value set to constructor and make private readonly 2021-01-25 15:47:31 +01:00
Shivam
331a7d0590 Merge branch 'master' into osu-mod-icon-fallbacks 2021-01-25 15:00:48 +01:00
Shivam
a741d91aed use null propragtor for Ruleset.Value and rulset instead of null checks 2021-01-25 14:57:35 +01:00
Shivam
6a85f5ca8b Add null checks to prevent nullrefexception in automated test 2021-01-25 14:21:53 +01:00
Shivam
ca08a19c40 Rename mod to modIcon 2021-01-25 13:28:46 +01:00
Shivam
74310da7cf Change parameter to be singular mod instead of plural 2021-01-25 13:24:43 +01:00
Shivam
f89eb7d75d Split and rename TournamentModDisplay component 2021-01-25 13:22:37 +01:00
Shivam
c6d46129ad Remove unneccessary ruleset parameter 2021-01-24 23:33:02 +01:00
Shivam
d38db6eace Change ModSprite to use ruleset's mods directly. 2021-01-24 23:29:05 +01:00
Shivam
eaa1519710 Implement native osu!lazer mod icons for tournament 2021-01-24 18:41:45 +01: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
Dean Herbert
49057e8cbc Cache TournamentStorage explicitly for better safety 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
959696c296 Merge branch 'master' into tourney-switching-ui 2021-01-10 17:34:03 +01:00
Dean Herbert
82725b59c0 Use PointConverter 2021-01-09 00:56:54 +09:00
Dean Herbert
9182f5dafb
Switch to using an anonymous type for serialisation
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-09 00:38:38 +09:00
Dean Herbert
a6766e64de Add custom handling of Point serialization to fix startup crashes of tournament client
SixLabors moved their data types around in a recent update (see
https://github.com/ppy/osu-framework/pull/4025) and it was deemed that
we should prefer `System.Drawing` primitives where possible.

This was applied to the tournament client via
https://github.com/ppy/osu/pull/11072 without correct consideration
given to the fact that we serialize these types.

`System.Drawing.Point` serializes into a comma separated string, which
seems to be less correct than what we had, so I've switched back to the
old format for the time being. We can reasses this in the future; the
main goal here is to restore usability to the tournament client.

Closes #11443.
2021-01-08 17:08:10 +09:00
Shivam
8e428353ee Revise TournamentSwitcher to include a close button 2020-12-26 15:44:59 +01:00
Shivam
6002014f95 Change underlyingstorage to alltournaments for clarity 2020-12-07 22:07:54 +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
Bartłomiej Dach
c9429632f4 Resolve new NRE inspections 2020-12-01 22:39:10 +01:00
dependabot-preview[bot]
b236c75ac8
Bump Microsoft.Win32.Registry from 4.7.0 to 5.0.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/runtime) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/dotnet/runtime/releases)
- [Commits](https://github.com/dotnet/runtime/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-01 17:32:24 +00: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
daceb0c049 Fix texture store not being initialised correctly
Without this change flags/mods would not work as expected. The video
store was being added as the texture store incorrectly.
2020-10-19 15:48:34 +09:00
Dean Herbert
3f41003d35 Move video store out of TournamentStorage
There was no reason it should be nested inside.
2020-10-19 15:48:15 +09:00
Dean Herbert
7ed862edd7 Add comment about migration code 2020-10-19 15:08:49 +09:00
Dean Herbert
f218a32e5f Merge branch 'master' into tourney-asset-refactor 2020-10-19 14:42:52 +09:00
Dean Herbert
cc41845f56 Add missing string function ordinal specifications 2020-10-16 12:49:31 +09:00
Dean Herbert
1989141968
Merge branch 'master' into tourney-asset-refactor 2020-10-07 21:34:07 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +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
smoogipoo
8bf679db8b Fix nullref in date text box 2020-09-02 13:17:17 +09:00
Shivam
d9ba677773 Change TeamFlag from sprite to a container with a sprite 2020-08-24 15:08:50 +02:00
Dean Herbert
e6d13edafb Force tournament client to run in windowed mode
We generally haven't tested in other modes, and it doesn't really make
sense as you wouldn't be able to use it in a meaningful way otherwise.

- [ ] Test on windows.
2020-08-20 19:41:29 +09:00
Salman Ahmed
ee9fa11d14 Use With(s => ...) extension for better readability 2020-08-19 07:47:02 +03:00
Shivam
c167727ac6 Merge branch 'master' into tourney-asset-refactor
# Conflicts:
#	osu.Game/IO/OsuStorage.cs
2020-08-09 12:38:41 +02: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
Shivam
c3cd2a74f5 Move general purpose migration to MigratableStorage 2020-07-01 22:57:16 +02:00
Shivam
0cddb85f1b Move storageconfig set and saving to migrate method 2020-06-28 15:27:50 +02:00
Shivam
9639ebdd97 Merge branch 'master' into tourney-asset-refactor 2020-06-28 15:06:34 +02:00
Bartłomiej Dach
082c94f98d Temporarily disable masking of tournament song bar 2020-06-28 13:14:46 +02:00
Dean Herbert
92e272ebb6 Remove unnecessary prefixes 2020-06-24 16:57:40 +09:00
Shivam
c94f95cc0d Check if the file exists before reading
This is (also) to address the review from bdach about StorageManager initialising a default value that gets overwritten upon migration anyway.
2020-06-24 02:40:22 +02:00
Shivam
af11340849 Fix nullref exceptions and redundant explicit type 2020-06-24 02:13:28 +02:00
Shivam
c32ef5e718 Address formatting issues 2020-06-24 00:37:29 +02:00
Shivam
9d2392b6b1 Cache TournamentStorage as Storage and only cast when necessary 2020-06-24 00:14:44 +02:00
Shivam
e5851be9ad change accessor from internal readonly to public get-only
Also changes the class accessor from internal to public
2020-06-24 00:06:27 +02:00
Shivam
0ca8c961c8 Remove string interpolation & unnecessary test setup 2020-06-24 00:05:30 +02:00
Shivam
7a3315dcf8 invert and early return 2020-06-24 00:00:21 +02:00
Shivam
8e8458ab8f make migrate public abstract in base and override 2020-06-23 23:58:28 +02:00
Shivam
8b9cf6fc52 Remove default value in Storagemgr 2020-06-23 23:57:58 +02:00
Shivam
e0d5a9182e make tournament migration private 2020-06-22 12:59:56 +02:00
Shivam
6b14079c0a InspectCode changes 2020-06-22 12:43:01 +02:00
Shivam
08759da3a7 Move drawings.ini out of config subfolder 2020-06-22 12:41:43 +02:00
Shivam
291dadf0b2 Merge branch 'master' of https://github.com/ppy/osu into tourney-asset-refactor 2020-06-22 12:01:24 +02:00
Shivam
f878388d57 Fix TestMigrationToSeeminglyNestedTarget failing 2020-06-22 11:56:14 +02:00
Dean Herbert
fc31d49629 try-catch registry lookup to avoid crashes on non-windows platforms 2020-06-22 16:34:04 +09:00
Dean Herbert
2d121b4e3d Simplify lookup fallback code 2020-06-22 16:32:27 +09:00
Dean Herbert
1df89c6a59
Merge branch 'master' into custom-ipc-location 2020-06-22 16:22:04 +09:00
Shivam
dd9697032c Introduce new class MigratableStorage 2020-06-16 17:39:20 +02:00
Shivam
02d66c4856 Refactor moving (2/2) 2020-06-16 17:15:43 +02:00
Shivam
b75fd7bfa8 Refactor moving logic (1/2) 2020-06-16 17:14:54 +02:00
Shivam
29ae1c460a TournamentStorage now takes in a parent storage 2020-06-16 17:00:20 +02:00
smoogipoo
d57b58a7dd Add temporary fix for tournament song bar disappearance 2020-06-15 18:47:55 +09:00
Bartłomiej Dach
51bbd91373 Bring back initial directory behaviour 2020-06-13 19:28:21 +02:00
Bartłomiej Dach
eb92c3390d Check for nulls when looking for ipc.txt 2020-06-13 17:17:58 +02:00
Bartłomiej Dach
2cadab8d29 Add xmldoc 2020-06-13 16:20:59 +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
34cd9f7a69 Streamline autodetect & manual set path 2020-06-13 15:32:30 +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
5041c74c7a Fix merge issue 2020-06-12 11:30:15 +09:00
Dean Herbert
5ef3a3f188
Merge branch 'master' into tourney-asset-refactor 2020-06-12 11:23:05 +09:00
Dean Herbert
80140842dc
Merge branch 'master' into headless-tournamentgamebase 2020-06-12 10:51:37 +09:00
Shivam
56a40e616b Add drawings to the migration test 2020-06-11 20:11:44 +02:00
Shivam
592e3bf4c9 Implement migrations for the drawings config file 2020-06-11 18:21:56 +02:00
Shivam
32d86d6fab Create storage for config files of a tournament 2020-06-11 18:07:24 +02:00
Shivam
327795ba99 Switch drawing storage to tournamentstorage 2020-06-11 18:00:47 +02:00
Shivam
c9dc17f3d8 Introduce migrations for drawings 2020-06-11 17:51:07 +02:00
Shivam
222ac86304 Add newlines at the end of the file 2020-06-11 15:52:14 +02:00
Shivam
af1bbe7857 move TournamentVideoResourceStore to separate file 2020-06-11 15:13:19 +02:00
Shivam
2964b457a0 Rename VideoStorage to VideoStore 2020-06-11 15:05:28 +02:00
Shivam
5d49b709b9 Change access modifier public -> internal 2020-06-11 14:09:21 +02:00
Shivam
a317b85fd8 Remove misleading log 2020-06-11 14:06:03 +02:00
Shivam
b69ff307d8 Fixed migration logic 2020-06-11 13:56:16 +02:00
Shivam
c2e01e198f Rename tournamentStorage to storage 2020-06-11 13:55:29 +02:00
Shivam
a43e1a0ae3 Remove whitespace 2020-06-10 08:41:13 +02:00
Shivam
0f39558da2 Apply review comment 2020-06-10 08:04:34 +02:00
Shivam
aacacd75f0 Remove abstract from the class 2020-06-09 21:14:05 +02:00
Shivam
af05ee67cb move base.loadcomplete to the bottom 2020-06-09 20:30:15 +02:00
Shivam
e57a229474 Move all the graphics related code to TournamentGame 2020-06-09 20:22:30 +02:00
Shivam
417919320c change namespace to osu.Game.Tournament.IO 2020-06-09 17:28:42 +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
smoogipoo
88aed1d504 Merge branch 'master' into update-inspectcode-version 2020-06-09 20:12:39 +09:00
Shivam
2f15d7fbac Code styling fixes 2020-06-08 20:04:38 +02:00
Shivam
d2ae146c1f Remove unnecessary parameters and implement delete 2020-06-08 19:51:44 +02:00
Shivam
ce66b72390 Refactor paths 2020-06-08 18:25:20 +02:00
Shivam
f01a86f5b1 Fix styling issues and move StorageManager to Configuration Folder 2020-06-08 03:12:37 +02:00
Shivam
ba5a747ac9 Implement migration for TournamentStorage 2020-06-08 03:03:57 +02:00
Shivam
9a20ffa8a3 Rename to TournamentStorage 2020-06-08 00:47:47 +02:00
Shivam
17cd9569ed Introduce new storage class and manager 2020-06-08 00:46:40 +02:00
Dean Herbert
9920911390 Fix tournament displayed beatmap potentially being out of order on quick changes 2020-06-04 17:20:08 +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
Shivam
7ae2383288 move stable config declaration and initial reading 2020-05-28 15:03:49 +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
Shivam
585100207c make CheckExists static public and removed unnecessary code 2020-05-20 22:30:31 +02:00
Shivam
d2416ce30d removed redundant code and use existing checkExists 2020-05-20 22:16:37 +02:00
Shivam
a5c2f97a76 use common const in TournamentGameBase 2020-05-20 22:15:51 +02:00
Shivam
b1c957c5e1 invert if-statement and early return + reuse of checkExists 2020-05-20 17:25:53 +02:00
Shivam
15ebe38303 Return null if path is not found, for clarity 2020-05-20 17:13:35 +02:00
Shivam
e018d07441 Use one constant for STABLE_CONFIG location string 2020-05-20 16:30:38 +02:00
Shivam
a0a54efd4e Fix test crashing because of sceneManager not being nullable 2020-05-18 01:05:34 +02:00
Shivam
7a839c1486 Renamed Refresh button to Change source 2020-05-18 00:50:08 +02:00
Shivam
9bfdfbea43 Move stablestorage check to path selection screen
Also forced stablepath to be empty during auto detection so it checks other sources to load ipc from
2020-05-18 00:47:31 +02:00
Shivam
59b006f9ac Make IPC error dialog reusable
and inspectcode fixes
2020-05-17 22:46:43 +02:00
Shivam
a97100216c Changed behaviour of refresh button in SetupScreen 2020-05-17 22:28:54 +02:00
Shivam
fbbf51851e Moved refresh button to directoryselector 2020-05-17 22:28:24 +02:00
Shivam
4bc858a215 Force a read of the location file during detection 2020-05-17 22:27:44 +02:00
Shivam
80d188ec91 Update xmldoc with accurate information about the model 2020-05-17 22:26:42 +02:00
Shivam
181cd67948 Merge remote-tracking branch 'upstream/master' into custom-ipc-location 2020-05-17 12:44:12 +02:00
Dean Herbert
13d4997c91 Remove custom back action logic (use receptor as intended) 2020-05-17 17:35:10 +09:00
Dean Herbert
864c1a73ae Only add back button if required 2020-05-17 17:27:52 +09:00
Dean Herbert
2c0ac8cc36 Move padding to fill, not scroll container 2020-05-17 17:25:26 +09:00
Shivam
358345cee7 Change logic for parentscreen/subscreen relation 2020-05-16 12:50:56 +02:00
Shivam
b1243d6a87 Add padding to so the back button is not in the way 2020-05-16 04:05:01 +02:00
Shivam
bf6ce390ff Add sub screen implementation to SeedingEditorScreen 2020-05-16 03:07:51 +02:00
Shivam
c931bae70e Add back button to TournamentScreen and the inputhandler for it 2020-05-16 03:07:27 +02:00
Shivam
3fc888ef95 User interface setup for custom IPC location
Right now makes use of another ActionableInfo field. Probably a better idea to add an extra button to the Current IPC Storage actionable field.
2020-05-16 03:03:10 +02:00
Shivam
9944a514da Dependency cache the ipc location file 2020-05-16 03:00:37 +02:00
Shivam
c40b3b9053 Refactored stable path finding and added json config detection.
This also migrates the values found in the other methods to the configuration file.
2020-05-16 02:59:48 +02:00
Shivam
08bb5cbcbf Introduce model to store path of stable osu! 2020-05-16 02:57:58 +02:00
Shivam
1768beb690 Rename class SeeingEditorScreen to SeedingEditorScreen 2020-05-14 21:52:10 +02:00
Shivam
6ec55eb400 Give mappool scene its own video 2020-05-14 21:51:39 +02:00
Dean Herbert
d6840d880a Update StableStorage implementation in line with framework changes 2020-05-08 10:40:04 +09:00
Dean Herbert
09759565fa Add support for 3v3 tournament chroma key layout 2020-05-07 14:51:14 +09:00
Dean Herbert
fcded20655 Don't specify IProvideVideo interface for now 2020-04-27 08:58:01 +09:00
Bartłomiej Dach
b9e0fed467 Use SongBar height instead of hard-coded dimensions 2020-04-27 00:02:58 +02:00