1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 07:53:38 +08:00
Commit Graph

435 Commits

Author SHA1 Message Date
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
Huo Yaoyuan
64fc5007fc Use language primitive types. 2019-11-12 19:56:45 +08:00
Huo Yaoyuan
31cc0d13da Use 'out var'. 2019-11-12 19:55:26 +08:00
Huo Yaoyuan
0d81b96c5f Use deconstruction declaration. 2019-11-12 19:55:22 +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
Dan Balasescu
592368a320
Merge branch 'master' into tournament-highlight-active-screen 2019-11-08 18:28:51 +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
Dan Balasescu
f68013059f
Merge branch 'master' into fix-tourney-button-sounds 2019-11-08 17:47:38 +09:00
Dean Herbert
651a1e2ae1 Highlight selected tournament screen's button 2019-11-08 17:22:51 +09:00
Dean Herbert
380859e06e Set clock on video directly; ignore long frames 2019-11-08 17:13:45 +09:00
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
Dean Herbert
5fe764b2db Fix tournament videos stuttering when changing scenes 2019-11-08 16:19:34 +09:00
Dean Herbert
5e416bd18d Fix tournament client crashing if beatmap added with an ID of zero 2019-11-06 14:47:31 +09:00
Huo Yaoyuan
3ad0369d7b Resolve new diagnostics in C# 7.3 2019-10-30 23:13:11 +08:00
Huo Yaoyuan
bcf8e3a9d4 Remove redundant properties from desktop projects.
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be Normalize .props 2019-10-30 21:54:14 +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
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup 2019-09-24 17:27:17 +09:00
dependabot-preview[bot]
50dcb70342
Bump Microsoft.Win32.Registry from 4.5.0 to 4.6.0
Bumps [Microsoft.Win32.Registry](https://github.com/dotnet/corefx) from 4.5.0 to 4.6.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-09-23 21:04:20 +00:00
Dean Herbert
bafb429e9b Don't show video background 2019-09-23 04:49:31 +09:00
Dean Herbert
4b7a421191 Set setup screen as default when opening 2019-09-23 04:47:51 +09:00
Dean Herbert
b41ac543c5 Allow changing logged in user 2019-09-23 04:46:50 +09:00
Dean Herbert
e07aa94fc8 Allow reloading ipc source 2019-09-23 04:22:50 +09:00
Dean Herbert
47a89231ad Read from (and allow reloading) IPC source 2019-09-23 03:17:14 +09:00
Dean Herbert
3b52e7c724 Add boilerplate logic 2019-09-23 03:17:14 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Dean Herbert
1d1372d639 Remove forceful resizing 2019-07-30 07:42:19 +09:00
Dean Herbert
56dbd94d16 Adjust tournament map pool layout to allow for larger pools 2019-07-27 19:46:46 +09:00
Dean Herbert
08014b1b99 Fix logo masking not being applied correctly for showcase/win screens 2019-07-13 11:13:05 +09:00
iiSaLMaN
e73f22eff8 Convert length retrieved from online to milliseconds 2019-07-09 17:53:34 +03:00
iiSaLMaN
129899f419 Add a BPM property in BeatmapInfo 2019-07-08 10:43:35 +03:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
d595860b14 Remove background from team intro screen 2019-06-23 20:09:42 +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
12740eff72 Format tournament bracket output 2019-06-22 22:42:11 +09:00
Unknown
1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Unknown
2c3504d302 fix bracket editor crash when no round description is present 2019-06-21 13:29:24 +02:00
smoogipoo
66b8dc2de7 Fix ladder permanently disappearing after being dragged offscreen 2019-06-21 15:47:41 +09:00
smoogipoo
5a34794240 Add default date to matches 2019-06-21 15:34:03 +09:00
smoogipoo
cffc82ce81 Add a max height for the ladder settings dropdowns 2019-06-21 15:22:56 +09:00
smoogipoo
ee30612a76 Add registry-based stable storage fallback 2019-06-21 15:07:12 +09:00
Dean Herbert
d6469aed58 Remove migration code 2019-06-19 14:55:28 +09:00
Dean Herbert
9a319e3f96 Add missing space 2019-06-18 17:59:47 +09:00
Dean Herbert
ba589b2139 Add more functionality and share more logic between editor screens 2019-06-18 17:59:33 +09:00
Dean Herbert
711214ed09 Use OsuButton everywhere 2019-06-18 17:17:46 +09:00
Dean Herbert
437ad2b0d0 Transfer more pieces of user across 2019-06-18 16:46:33 +09:00
Dean Herbert
4baadf6319 Add map pool editing functionality to round editor 2019-06-18 16:37:13 +09:00
Dean Herbert
412778c71a Rename nested TeamRow class for clarity 2019-06-18 15:54:34 +09:00
Dean Herbert
77f3d4848b Make common base class for editor screens 2019-06-18 15:53:03 +09:00
Dean Herbert
926a11ab8c Group, rename and standardise tests 2019-06-18 15:28:36 +09:00
Dean Herbert
3fcb8081dd Remove unused ruleset bindable 2019-06-18 15:20:36 +09:00
Dean Herbert
1a92263652 Ignore parse errors rather than dying 2019-06-18 15:18:14 +09:00
Dean Herbert
3db6913a9c Rename editor screens removing plurals 2019-06-18 15:15:28 +09:00
Dean Herbert
7c163ad911 Move font-related code out of TournamentGame 2019-06-18 15:09:39 +09:00
Dean Herbert
21138e6e2c Fix mismatching filenames 2019-06-18 15:05:55 +09:00
Dean Herbert
6226889d1c Add xmldoc and serialisable attributes 2019-06-18 15:00:33 +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
1e2f9d1ba1 Fix start failure if videos are missing 2019-06-17 21:07:30 +09:00
Dean Herbert
5911105298 Make team editor prettier 2019-06-17 20:59:17 +09:00
Dean Herbert
ba884162b2 Add player editor 2019-06-17 20:47:45 +09:00
Dean Herbert
acca2587ac Use Current instead of Bindable
Bindable is going to be removed upstream
2019-06-17 19:36:26 +09:00
Dean Herbert
be4cc8c6e1 Simplify LadderEditorSettings implementation by using bindables directly 2019-06-17 19:11:57 +09:00
Dean Herbert
58136360e0 Bindable handling in DrawableTournamentTeam 2019-06-17 19:11:57 +09:00
Dean Herbert
93fc14426b Convert TournamentTeam props to use binadbles 2019-06-17 19:11:57 +09:00
Dean Herbert
e58d259498 Create wireframe for team editor 2019-06-17 19:11:57 +09:00
Dean Herbert
c9bd62e815 Use bindable logic for grouping name/description updates 2019-06-14 20:32:23 +09:00
Dean Herbert
ef21a9e1d2 Use bindable flow to avoid scheduled updates 2019-06-14 20:32:23 +09:00
Dean Herbert
eb86d43d19 Update grouping dropdown after new groupings are added 2019-06-14 20:32:23 +09:00
Dean Herbert
9818637b8d Fix MapPoolScreen test 2019-06-14 20:32:23 +09:00
Dean Herbert
a7fcec8d97 Fix TournamentSceneManager test 2019-06-14 20:32:23 +09:00
Dean Herbert
8da448fca7 Improve usability of grouping editor screen 2019-06-14 20:32:23 +09:00
Dean Herbert
0db013b782 Fix save button not being topmost 2019-06-14 20:32:23 +09:00
Dean Herbert
4cd6955a96 Fix GameplayScreen test not working 2019-06-14 20:32:23 +09:00
Dean Herbert
d4808ded0b Fix tooltips not showing at correct location 2019-06-14 20:32:23 +09:00
Dean Herbert
2b4384bb30 Fix crash when setting a match as current which doesn't have a grouping 2019-06-14 20:32:23 +09:00
Dean Herbert
831686d20b Fix crash when starting with an empty bracket 2019-06-14 20:32:23 +09:00