1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 23:23:04 +08:00
Commit Graph

428 Commits

Author SHA1 Message Date
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
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
372060bc2b Only trigger changes if new user information is actually populated 2020-03-03 18:57:00 +09:00
Dean Herbert
a2273234cb Better handle startup when ladder cannot be read correctly 2020-03-03 18:57:00 +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
32fb87acec Update country names 2020-01-23 16:45:30 +09:00
Dean Herbert
c0935b9b86 Update naming in tournament 2020-01-22 23:13:21 +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
43f144cd6a Invert condition 2020-01-20 11:48:56 +09:00
Dean Herbert
55ed823c88 Fix hard crashes on tournament client if a round contains an empty beatmap 2020-01-19 22:26:15 +09:00
recapitalverb
af167eb719
Remove duplicate condition in TournamentFont 2020-01-13 23:28:26 +07:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Huo Yaoyuan
1b33581667 Construct DllResourceStore with assemblies 2019-12-28 21:13:18 +08: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
dependabot-preview[bot]
b764a74919
Bump Microsoft.Win32.Registry from 4.6.0 to 4.7.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases)
- [Commits](https://github.com/dotnet/corefx/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:52:22 +00:00
Dean Herbert
c49aeb08c4 Add API methods to perform requests out-of-queue 2019-11-29 20:03:14 +09:00
Dean Herbert
9a941c4f94 Update font loading to use new method 2019-11-29 02:15:13 +09:00
Dean Herbert
14277d714e Fix tournament client crashing due to null ruleset 2019-11-29 01:01:25 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dan Balasescu
2aa13370df
Merge branch 'master' into song-bar-stats 2019-11-26 13:27:01 +09:00
Dean Herbert
b85189f855 Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage 2019-11-25 11:31:12 +09:00
Dean Herbert
45514ff660 Apply fixes 2019-11-25 11:30:55 +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
244177880e Only show star on HR 2019-11-24 01:45:21 +09:00
Dean Herbert
326a8f62eb Calculate more correct AR locally for now 2019-11-24 00:22:01 +09:00
Dean Herbert
eb81d15463 Don't attempt to repopulate already populated users on startup 2019-11-23 20:55:00 +09:00
Dean Herbert
e3f3b1ab1a Display useful statistics on song bar depending on current ruleset 2019-11-23 20:52:41 +09:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09: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
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Huo Yaoyuan
608785b99a Update .Net Standard projects to 2.1 2019-11-18 18:35:58 +08:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00