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
