1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 11:22:55 +08:00
Commit Graph

71 Commits

Author SHA1 Message Date
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
Dean Herbert
09759565fa Add support for 3v3 tournament chroma key layout 2020-05-07 14:51:14 +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
99f28efc96 Automatically mark the currently selected match as stsrated on entering gameplay screen 2020-03-17 13:16:52 +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
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dean Herbert
832e64cc95 Fix test failures due to null current match 2020-03-09 14:57:19 +09:00
Dean Herbert
3744aaf55f Update vertical alignment of chroma area 2020-03-08 18:16:32 +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
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
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
e678a068b6 Bring design up-to-date with 2019 standards 2020-03-03 19:20:42 +09:00
Dean Herbert
f1f4f1ffbd Add torus font 2020-03-03 18:17:51 +09: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
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
Dean Herbert
ba97b887b4 Allow cusotmisation of the colour portion of the tournament logo header 2019-06-23 20:05:55 +09:00
Dean Herbert
711214ed09 Use OsuButton everywhere 2019-06-18 17:17:46 +09:00
Dean Herbert
da20904a57 MatchPairing -> TournamentMatch 2019-06-18 14:57:05 +09:00
Dean Herbert
96e24ebd20 General namespace tidy-up 2019-06-18 14:51:48 +09:00
Dean Herbert
4f5abeb79f Grouping -> Round 2019-06-18 14:44:15 +09:00
Dean Herbert
796afc0bf9 Rename and expand chat tests 2019-06-18 14:03:09 +09:00
Dean Herbert
93fc14426b Convert TournamentTeam props to use binadbles 2019-06-17 19:11:57 +09:00
Dean Herbert
4cd6955a96 Fix GameplayScreen test not working 2019-06-14 20:32:23 +09:00
Dean Herbert
9e4f2c7eb9 Move font local 2019-06-13 19:41:01 +09:00
Dean Herbert
069245e7ab Update header colour to match TWC 2019-05-18 21:40:02 +09:00
Dean Herbert
30e36627cf Remove redundant code 2019-05-18 21:37:46 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
cf63ee4948 Update licence headers 2019-03-04 13:24:19 +09:00
Dean Herbert
5b81de7663 Apply codefactor fixes 2019-03-04 13:04:07 +09:00
Dean Herbert
132ce541f3 Fix obsolete font usages 2019-03-04 12:06:41 +09:00
Dean Herbert
73d266fe10 Fix win screen being incorrectly displayed after switching matches 2019-03-02 16:32:11 +09:00
Dean Herbert
389632d932 Fix bindable changes 2019-03-02 13:40:43 +09:00
Dean Herbert
6ea1ed8d04 Fix unnecessary texture atlas generation 2019-02-17 19:48:54 +09:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
fdba2bffb9 Ensure last state is set correctly 2018-11-22 17:33:48 +09:00
Dean Herbert
4e8c7a4dc0 Adjust gameplay area to match better
Also reduces size of score display to avoid hiding combos.
2018-11-22 15:42:10 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
5621101d40 Adjust gameplay screen size 2018-11-18 12:39:25 +09:00
Dean Herbert
e6529eac3e Add automation of map pool and win screen workflows 2018-11-18 08:30:17 +09:00
Dean Herbert
70739ae5a0 Reduce rate of scale of score display 2018-11-18 08:25:23 +09:00