h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 05:33:21 +08:00
Code Issues Releases Wiki Activity
47,635 Commits 5 Branches 664 Tags 362 MiB
b317a95fe1
Commit Graph

711 Commits

Author SHA1 Message Date
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