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
b1c957c5e1
invert if-statement and early return + reuse of checkExists
2020-05-20 17:25:53 +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
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
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
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
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
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
Dean Herbert
99f28efc96
Automatically mark the currently selected match as stsrated on entering gameplay screen
2020-03-17 13:16:52 +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
Dean Herbert
b902e50396
Add resolution selector in tournament setup screen
2020-03-13 15:44:23 +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
Dan Balasescu
f37444ad18
Merge branch 'master' into tournament-header-logo
2020-03-12 18:12:08 +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
efceeba076
Use fixed width for tournament score displays
2020-03-12 02:22:02 +09:00
Dan Balasescu
f49f9f40ae
Merge branch 'master' into tournament-design-seeding
2020-03-11 18:03:27 +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
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
832e64cc95
Fix test failures due to null current match
2020-03-09 14:57:19 +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
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
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
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
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
aeb6bf5b46
Remove unnecessary width specification on editor screens
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
Dean Herbert
2d95f29925
Add gameplay screen specific video
2020-03-06 18:38:54 +09:00
Dean Herbert
88759e65a0
Remove layout durations from tournament editor screns for better performance
2020-03-06 16:31:36 +09:00
Dean Herbert
ac88ba717b
Ensure screens respect aspect ratio in tests
2020-03-06 16:13:07 +09:00
Andrei Zavatski
6631b07442
Refactor to replace existing panels
2020-03-04 14:58:15 +03:00
Dan Balasescu
5eeed3faa1
Merge branch 'master' into owc-2019
2020-03-04 16:27:46 +09:00
Dean Herbert
c306d3de2e
Fix typo in button
...
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-04 16:03:43 +09:00
Dan Balasescu
dadf151e7c
Merge branch 'master' into tournament-seeding-screen
2020-03-04 15:42:44 +09:00
Dan Balasescu
6f5d2da03e
Merge branch 'master' into add-torus-font
2020-03-04 13:56:30 +09:00
Dean Herbert
dade58adf3
Fix crash from editor screen test scene when trying to view seeding editor
2020-03-04 13:21:14 +09:00
Dean Herbert
6b7144e21b
Fix non-matching filename
2020-03-04 13:19:52 +09:00
Dean Herbert
22c4c515f5
Merge pull request #8123 from smoogipoo/fix-ladderscreen-nullref
...
Fix nullref when deleting teams in the ladder screen
2020-03-04 13:18:07 +09:00
smoogipoo
fc0821f194
Fix nullref when deleting teams in the ladder screen
2020-03-04 12:37:42 +09:00
Dean Herbert
23091cb25e
Merge branch 'split-out-files' into tournament-seeding-screen
2020-03-04 12:11:17 +09:00
Dean Herbert
0f7316d41d
Move file to other file
2020-03-04 12:08:44 +09:00
Dean Herbert
e678a068b6
Bring design up-to-date with 2019 standards
2020-03-03 19:20:42 +09:00
Dean Herbert
1b355d02d6
Update video resource paths
2020-03-03 19:20:42 +09:00
Dean Herbert
093f2affdf
Add seeding screen
2020-03-03 19:19:03 +09:00
Dean Herbert
f1f4f1ffbd
Add torus font
2020-03-03 18:17:51 +09:00
smoogipoo
958c891d15
Update with framework-side bindable list changes
2020-02-17 15:06:14 +09:00
Dean Herbert
7c62cc3ac3
Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework
2020-01-22 22:57:52 +09:00
smoogipoo
bfb056c612
Apply input method signature refactorings
2020-01-20 18:17:21 +09:00
Dean Herbert
cd5290b030
Enforce using get-only auto property where possible
2020-01-20 13:50:27 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
77b9989e11
Fix some weird private field names
2019-12-11 14:10:35 +09:00
Huo Yaoyuan
c0fe91a84c
Merge branch 'master' into sharpen
2019-11-26 18:21:50 +08:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Huo Yaoyuan
4cd7d67fe4
Use early return for if-pattern-matching.
2019-11-22 00:02:40 +08:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Huo Yaoyuan
144812669d
Use static local functions.
2019-11-12 19:56:54 +08:00
Huo Yaoyuan
31cc0d13da
Use 'out var'.
2019-11-12 19:55:26 +08:00
Huo Yaoyuan
e5e8e70704
Use pattern matching.
2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
Dean Herbert
2f8768a4b1
Move LabelledDropdown local to usage
2019-11-12 11:04:49 +09:00
Dean Herbert
bedd136c81
Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset
2019-11-12 11:02:36 +09:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
Dean Herbert
5d96e6d90a
Populate users centrally, using the correct ruleset
2019-11-11 17:39:48 +09:00
Dean Herbert
702a1c496b
Add ruleset selection to tournament client
2019-11-11 17:39:28 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
Dean Herbert
c1ad3114d6
Merge remote-tracking branch 'upstream/master' into tournament-improve-transitions
2019-11-08 19:09:19 +09:00
Dean Herbert
12b855d68f
Make drawing screen transition properly
2019-11-08 17:56:11 +09:00
Dean Herbert
7b8ed1ac9a
Improve tournament screen transitions
2019-11-08 17:56:04 +09:00
Dean Herbert
8bcbc93501
Fix tournament buttons playing sound effects
2019-11-08 17:00:47 +09:00
Huo Yaoyuan
3ad0369d7b
Resolve new diagnostics in C# 7.3
2019-10-30 23:13:11 +08:00
Dean Herbert
08040adfad
Expose Current bindable in LabelledComponents
...
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 16:24:28 +09:00
Dean Herbert
9372526d3a
Don't automatically return to gameplay from map pool if no picks are made
...
Closes #6491 .
2019-10-14 20:08:05 +09:00
Dean Herbert
f493f1c71d
Move new components to v2 namespace
2019-09-24 19:00:26 +09:00
smoogipoo
df692b091c
Make LabelledComponent generic
2019-09-24 18:22:02 +09:00
Dean Herbert
bafb429e9b
Don't show video background
2019-09-23 04:49:31 +09:00
Dean Herbert
b41ac543c5
Allow changing logged in user
2019-09-23 04:46:50 +09:00
