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
Bartłomiej Dach
3c1730d0ca
Expose SongBar's height
2020-04-26 23:59:24 +02:00
Shivam
39a593120c
Fixed CodeInspect errors
2020-04-24 17:00:35 +02:00
Shivam
28dcfe867c
Add Chroma keying to the background of the showcase video.
2020-04-23 21:09:12 +02:00
Shivam
085b6ae25f
Add background video for showcase scene (Tournament Client)
2020-04-23 20:24:03 +02:00
Dean Herbert
f4dc604dbf
Fix dragging tournament ladder too far causing it to disappear
2020-04-08 13:32:37 +09:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
Dan Balasescu
b5488bdecf
Merge pull request #8403 from peppy/chroma-key-width
...
Add ability to adjust (and save) chroma-key area width
2020-03-23 13:54:56 +09:00
Dean Herbert
1b6342438f
Hide scrollbars in tournament chat display
2020-03-23 12:05:16 +09:00
Dean Herbert
27ae2d29aa
Add ability to adjust (and save) chroma-key area width
2020-03-23 11:47:24 +09:00
Dean Herbert
2ca225877f
Merge branch 'master' into tournament-mappool-flow-logic
2020-03-18 15:05:20 +09:00
Dan Balasescu
c6e4bf35de
Merge branch 'master' into start-match-on-gameplay
2020-03-17 18:21:55 +09:00
Dean Herbert
99f28efc96
Automatically mark the currently selected match as stsrated on entering gameplay screen
2020-03-17 13:16:52 +09:00
Dean Herbert
8895d52d29
Fix header-text scaling on intro/winner screens
2020-03-17 13:16:18 +09:00
Marcus "Mestro" Nordgren
24fe7538fd
Use new logo name for showcase screen
2020-03-16 13:09:15 +01:00
Dan Balasescu
0245bab7c6
Merge branch 'master' into user-cards-update
2020-03-16 14:27:21 +09:00
Dan Balasescu
70a17ae6cc
Merge branch 'master' into tournament-resolution-selector
2020-03-15 00:15:31 +09:00
Dean Herbert
bee855bd1d
Remove using
2020-03-13 15:54:46 +09:00
Dean Herbert
b902e50396
Add resolution selector in tournament setup screen
2020-03-13 15:44:23 +09:00
Dean Herbert
edd444ea73
Fix mod sprite bleeding border colour
2020-03-13 14:36:46 +09:00
Dean Herbert
30ad580993
Fix map pool screen vertical layout
2020-03-13 14:34:33 +09:00
Dean Herbert
00d7dc19cc
Update tests and logic
2020-03-13 14:25:58 +09:00
Dean Herbert
fbb7e9f12a
Add tests (wip)
2020-03-13 14:25:58 +09:00
Dean Herbert
ef0acde458
Adjust to allow for extra row
2020-03-13 14:25:58 +09:00
Dean Herbert
9e52fbdd3e
Merge pull request #8226 from omkelderman/stable-install-path-from-env-var
...
Add ability to set stable path for tourney client via environment variable
2020-03-12 19:48:48 +09:00
Dean Herbert
08dc4a0e8b
Merge pull request #8216 from smoogipoo/video-start-from-zero
...
Apply osu!-side video sprite changes
2020-03-12 19:46:46 +09:00
Dean Herbert
604ce37064
Merge remote-tracking branch 'upstream/master' into video-start-from-zero
2020-03-12 18:57:53 +09:00
Dan Balasescu
f37444ad18
Merge branch 'master' into tournament-header-logo
2020-03-12 18:12:08 +09:00
Dan Balasescu
4cdb94f3a5
Merge pull request #8236 from peppy/tournament-all-video-extensions
...
Allow videos to be loaded with any extension
2020-03-12 18:03:45 +09:00
Dean Herbert
ec1c6f88ee
Adjust metrics to align logo pieces correctly on gameplay / map pool
2020-03-12 14:27:56 +09:00
Dean Herbert
7b1ac03b18
Hide logo on gameplay screen
2020-03-12 14:27:56 +09:00
Dean Herbert
b6b802e821
Add back customisable header logo/text
...
Also adds test scene for MatchHeader component.
2020-03-12 14:27:56 +09:00
Dean Herbert
190ff97486
Rename classes to better suit purpose
2020-03-12 14:27:56 +09:00
Dean Herbert
39bb98bfb2
Allow videos to be loaded with any extension
...
Also moves all tournament user resources to a "tournament" subfolder.
2020-03-12 13:27:00 +09:00
Dean Herbert
efceeba076
Use fixed width for tournament score displays
2020-03-12 02:22:02 +09:00
Olle Kelderman
2866d62653
Use environment variable for initializing osuInstallPath
2020-03-11 16:26:53 +01:00
Dan Balasescu
f49f9f40ae
Merge branch 'master' into tournament-design-seeding
2020-03-11 18:03:27 +09:00
smoogipoo
8eb8572c73
Apply osu!-side video sprite changes
2020-03-11 18:00:39 +09:00
Dean Herbert
02af3eefbd
Merge branch 'master' into tournament-mappool-flow-logic
2020-03-11 14:40:18 +09:00
Dean Herbert
ed837d3115
Use framework extension method for FromHex
2020-03-11 10:18:41 +09:00
smoogipoo
19ce2d643e
Remove unused using
2020-03-10 09:51:30 +09:00
Dean Herbert
e158cbfe24
Merge branch 'master' into tournament-design-schedule
2020-03-10 09:40:08 +09:00
Dan Balasescu
f5e134806a
Merge branch 'master' into tournament-design-gameplay
2020-03-09 19:33:53 +09:00
Dan Balasescu
3554cdda36
Merge pull request #8179 from peppy/tournament-design-win
...
Implement 2020 win screen design
2020-03-09 19:33:42 +09:00
smoogipoo
6421f28ac7
Fix nullref
2020-03-09 19:07:44 +09:00
Dan Balasescu
6d23c3b4ab
Merge pull request #8180 from peppy/tournament-design-intro
...
Implement 2020 intro screen design
2020-03-09 18:38:07 +09:00
Dan Balasescu
1fec5d17a8
Merge pull request #8174 from peppy/tournament-design-ladder
...
Implement 2020 ladder design
2020-03-09 18:15:59 +09:00
Dean Herbert
8b16dadfe5
Merge branch 'master' into tournament-design-gameplay
2020-03-09 15:09:02 +09:00
Dean Herbert
33f457d663
Fix layout issues with TournamentBeatmapPanel
2020-03-09 15:08:24 +09:00
Dean Herbert
832e64cc95
Fix test failures due to null current match
2020-03-09 14:57:19 +09:00
Dean Herbert
e4f07e5284
Merge branch 'master' into tournament-design-gameplay
2020-03-09 14:50:36 +09:00
Dan Balasescu
0ecf6a4ecd
Merge branch 'master' into tournament-design-win
2020-03-09 14:16:34 +09:00
Dan Balasescu
1e9adbba4e
Merge branch 'master' into tournament-design-intro
2020-03-09 14:16:22 +09:00
Dan Balasescu
fac5530cab
Merge branch 'master' into tournament-design-mappool
2020-03-09 14:16:05 +09:00
Dan Balasescu
0f44c0739a
Merge branch 'master' into tournament-design-ladder
2020-03-09 14:16:01 +09:00
smoogipoo
b61e56cda5
Resolve post-merge issue
2020-03-09 13:29:17 +09:00
Dan Balasescu
ab79f36c41
Merge branch 'master' into tournament-drawable-team-tidy
2020-03-09 13:26:20 +09:00
Dan Balasescu
2eb8f245da
Merge branch 'master' into tournament-base-changes
2020-03-09 09:24:46 +09:00
Dan Balasescu
1c580216af
Merge pull request #8175 from peppy/score-counter-flexibility
...
Increase flexibility of StarCounter component
2020-03-09 09:17:55 +09:00
Dean Herbert
61297847a7
Fix compilation failure
2020-03-09 01:21:37 +09:00
Dean Herbert
414e704d37
Use existing local function
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-09 00:18:28 +09:00
Dean Herbert
dc201a68dc
Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool
2020-03-08 20:16:48 +09:00
Dean Herbert
5f6ce7fde5
Merge branch 'tournament-drawable-team-tidy' into tournament-design-ladder
2020-03-08 20:16:35 +09:00
Dean Herbert
7f38ff8046
Merge branch 'tournament-drawable-team-tidy' into tournament-design-schedule
2020-03-08 20:16:12 +09:00
Dean Herbert
ece049e0c9
Merge branch 'tournament-drawable-team-tidy' into tournament-design-seeding
2020-03-08 20:15:48 +09:00
Dean Herbert
71824ce7d6
Merge branch 'tournament-drawable-team-tidy' into tournament-design-win
2020-03-08 20:14:59 +09:00
Dean Herbert
ba865aa195
Merge branch 'tournament-drawable-team-tidy' into tournament-design-intro
2020-03-08 20:14:15 +09:00
Dean Herbert
cc438210a3
Merge branch 'tournament-drawable-team-tidy' into tournament-design-gameplay
2020-03-08 20:13:29 +09:00
Dean Herbert
2fe32b7d2b
Remove LadderInfo requirement in DrawableMatchTeam
2020-03-08 19:41:22 +09:00
Dean Herbert
9138bafbeb
Fix alignment of flags on team intro screen
2020-03-08 18:49:06 +09:00
Dean Herbert
8b0b910196
Update song / chat / beatmap info display to reflect new design
2020-03-08 18:25:22 +09:00
Dean Herbert
3744aaf55f
Update vertical alignment of chroma area
2020-03-08 18:16:32 +09:00
Dean Herbert
0019199082
Merge branch 'tournament-base-changes' into tournament-design-gameplay
2020-03-08 18:12:10 +09:00
Dean Herbert
0102aaf32a
Move chat expand/contract logic local to tournament
2020-03-08 18:11:57 +09:00
Dean Herbert
5d5910822b
Initial pass of intro screen design update
2020-03-08 16:06:37 +09:00
Dean Herbert
a85cef2f06
Reset win screen video on display; add fade in transition
2020-03-08 16:05:37 +09:00
Dean Herbert
3a3a2ad2a7
Fix video looping not propagating when set too early in initialisation
2020-03-08 16:04:51 +09:00
Dean Herbert
3ac599246d
Initial pass of seeding screen design update
2020-03-08 16:03:37 +09:00
Dean Herbert
8ab9ca77d6
Fix next match timer not updating
2020-03-08 16:02:13 +09:00
Dean Herbert
6c0a27e0b9
Improve look of selected match
2020-03-08 16:02:13 +09:00
Dean Herbert
9934a97bd0
Limit upcoming matches displayed to 8
2020-03-08 16:01:41 +09:00
Dean Herbert
434feb5ac6
Fix alignment on schedule screen
2020-03-08 16:01:41 +09:00
Dean Herbert
059aea8ead
Initial pass of schedule screen design update
2020-03-08 16:00:00 +09:00
Dean Herbert
9bd837da41
Update match score display
2020-03-08 15:55:54 +09:00
Dean Herbert
3807c449bd
Update chat position
2020-03-08 15:55:54 +09:00
Dean Herbert
e25206728f
Hide score displays during warmup
2020-03-08 15:55:54 +09:00
Dean Herbert
86b12a384b
Initial pass of gameplay screen design update
2020-03-08 15:55:54 +09:00
Dean Herbert
ba6c4abbe6
Initial pass of ladder screen design update
2020-03-08 15:52:41 +09:00
Dean Herbert
2981730442
Initial pass of map pool screen design update
2020-03-08 15:49:37 +09:00
Dean Herbert
77c94afcf1
Add better flow logic to map pool layout when few beatmaps are present
2020-03-08 15:44:05 +09:00
Dean Herbert
4d74493289
Initial pass of win screen design update
2020-03-08 15:38:10 +09:00
Dean Herbert
1c5d6e0cf4
Split out nested classes to higher level for better code sharing
2020-03-08 15:34:45 +09:00
Dean Herbert
aed52179f0
Fix weird reverse logic
2020-03-08 15:32:22 +09:00
Dean Herbert
01e32896ee
Make save changes button more prominent
2020-03-08 15:32:22 +09:00
Dean Herbert
aeb6bf5b46
Remove unnecessary width specification on editor screens
2020-03-08 15:32:22 +09:00
Dean Herbert
129c8fe24f
Add helper method to get winning team colour
2020-03-08 15:32:22 +09:00
Dean Herbert
3caffb81e1
Add new element colours to TournamentGame
2020-03-08 15:32:22 +09:00
Andrei Zavatski
66f40f7f6e
Merge remote-tracking branch 'refs/remotes/ppy/master' into user-cards-update
2020-03-07 04:01:36 +03:00
Dean Herbert
09bd5ad185
Merge pull request #8151 from peppy/tourney-simplify-video-spec
...
Simplify tournament video construction
2020-03-06 23:15:02 +09:00
Dan Balasescu
3d54334dd6
Merge pull request #8150 from peppy/remove-layout-durations-tournament-editors
...
Remove layout durations from tournament editor screens for better performance
2020-03-06 22:38:06 +09:00
Dan Balasescu
643b25e484
Merge branch 'master' into tourney-simplify-video-spec
2020-03-06 22:28:21 +09:00
Dean Herbert
0a72fa69ab
Simplify video creation (and handle fallback better)
2020-03-06 18:39:12 +09:00
