h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 05:17:25 +08:00
Code Issues Releases Wiki Activity
34,722 Commits 3 Branches 654 Tags 364 MiB
c64343c7d7
Commit Graph

586 Commits

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