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

177 Commits

Author SHA1 Message Date
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
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
2fe32b7d2b Remove LadderInfo requirement in DrawableMatchTeam 2020-03-08 19:41:22 +09:00
Dean Herbert
6c0a27e0b9 Improve look of selected match 2020-03-08 16:02:13 +09:00
Dean Herbert
434feb5ac6 Fix alignment on schedule screen 2020-03-08 16:01:41 +09:00
Dean Herbert
ba6c4abbe6 Initial pass of ladder screen design update 2020-03-08 15:52:41 +09:00
Dean Herbert
0a72fa69ab Simplify video creation (and handle fallback better) 2020-03-06 18:39:12 +09:00
Dan Balasescu
5eeed3faa1
Merge branch 'master' into owc-2019 2020-03-04 16:27:46 +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
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
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
Huo Yaoyuan
ecfc6dfa3d CA1825: use Array.Empty. 2019-12-17 12:59:48 +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
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09: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
cffc82ce81 Add a max height for the ladder settings dropdowns 2019-06-21 15:22:56 +09:00
Dean Herbert
21138e6e2c Fix mismatching filenames 2019-06-18 15:05:55 +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
1e2f9d1ba1 Fix start failure if videos are missing 2019-06-17 21:07:30 +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
93fc14426b Convert TournamentTeam props to use binadbles 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
89c68c78d1 Reduce size of paths 2019-06-13 18:06:24 +09:00
Dean Herbert
eb0f0aefba Apply review changes 2019-06-13 17:12:06 +09:00
Dean Herbert
ba475ef6c8 Remove unnecessary invalidation 2019-06-13 16:38:45 +09:00
Dean Herbert
4af16262e3 Limit zoom range of bracket display 2019-06-13 16:38:39 +09:00
Dean Herbert
a0503fcbe3 Reduce update rate of paths 2019-06-13 16:05:34 +09:00
Dean Herbert
530032cafe Update obsoleted font usages 2019-05-15 13:10:58 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
1ef2a4c46f Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-04-03 16:23:33 +09:00
Dean Herbert
b0971ef0fd Fix remaining inspections 2019-03-04 14:18:04 +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
4c66ebb501 Fix formatting issues 2019-03-02 13:52:56 +09:00
Dean Herbert
389632d932 Fix bindable changes 2019-03-02 13:40:43 +09:00
Dean Herbert
e7668a749b Bind to correct target (hacky) 2019-02-17 19:49:10 +09:00
Dean Herbert
6ea1ed8d04 Fix unnecessary texture atlas generation 2019-02-17 19:48:54 +09:00
Dean Herbert
5048f425d4 Add ability to reset bracket 2019-02-06 18:36:15 +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
61ca79a8b2 Add conditional match support 2018-12-02 22:36:21 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
5659ba6ef8 Add logo to ladder screen 2018-11-17 14:59:37 +09:00
Dean Herbert
bed967b456 Add better date string formatting 2018-11-17 14:05:42 +09:00
Dean Herbert
87243a72d3 Add date entry for pairings 2018-11-17 12:14:15 +09:00
Dean Herbert
cf0976955b Expose groupings editor 2018-11-16 20:30:12 +09:00
Dean Herbert
67bb428aef Move editing functionality to its own screen 2018-11-16 20:16:18 +09:00
Dean Herbert
604cb4cb9e Update to support new dropdown logic 2018-11-15 14:12:41 +09:00
Dean Herbert
eabcef3e12 Add schedule screen 2018-11-11 10:13:17 +09:00
Dean Herbert
b5c2d94cc4 Avoid rendering more than one video at once 2018-11-11 01:39:02 +09:00
Dean Herbert
1756ef95cb Add ability to adjust scores from gameplay screen 2018-11-10 07:31:06 +09:00
Dean Herbert
e170372932 Populate json with enums better 2018-11-09 17:54:05 +09:00
Dean Herbert
9064f3fe0f Fix ladder manager not saving changes out correctly 2018-11-09 17:39:46 +09:00
Dean Herbert
8a917e4cc7 Fix context menus (temporarily) 2018-11-09 16:57:45 +09:00
Dean Herbert
5c84c3c0a8 Add support for picks and bans 2018-11-08 06:29:04 +09:00
Dean Herbert
a0d64c1b13 Add ability to select current match 2018-11-07 01:24:35 +09:00
Dean Herbert
53ec01d51f Perform mappings earlier in execution 2018-11-06 20:18:11 +09:00
Dean Herbert
6f25548737 Remove now unnecessary null setters 2018-11-06 14:49:20 +09:00
Dean Herbert
a918e83b1e Add drawings screen 2018-11-04 04:58:59 +09:00
Dean Herbert
7a753ad9e2 Change grouping title colours to match white background 2018-10-18 02:17:54 +09:00
Dean Herbert
830eda2a9f Fix unused properties 2018-10-16 16:07:59 +09:00
Dean Herbert
3a5af47ee8 Populate beatmaps with api information when not present 2018-10-16 15:20:12 +09:00
Dean Herbert
63fbe4e946 Add map pool beatmaps to groupings 2018-10-14 18:00:28 +09:00
Dean Herbert
a02caeef64 Add team intro screen
Also adds dates to groups and matches (must be manually populated via json)
2018-10-14 05:19:50 +09:00
Dean Herbert
c4b486f1d4 Fix transfer of teams in the case loser and winner progression are equal 2018-10-14 03:04:06 +09:00
Dean Herbert
b1862a863b Fix not being able to decrement scores of matches with no defined progression 2018-10-14 03:03:40 +09:00
Dean Herbert
f5716c3d21 Add ability to change best of, add and delete groupings 2018-10-14 01:03:04 +09:00
Dean Herbert
a4bb4255b1 Add grouping manager 2018-10-13 07:10:13 +09:00
Dean Herbert
77055f6d5c Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-10-12 18:49:47 +09:00
Dean Herbert
73f451f27a Fix right click regression 2018-09-25 13:39:33 +09:00
Dean Herbert
2abe96fb9c Fix crash 2018-09-25 13:39:27 +09:00
Dean Herbert
c210ea7c39 Improve zoom logic 2018-09-25 10:47:56 +09:00
Dean Herbert
e74fd042aa Use MouseUp instead of MouseDown for now 2018-09-25 10:35:00 +09:00
Dean Herbert
991d85a9f3 Cleanups 2018-09-25 10:30:04 +09:00
Dean Herbert
a5888feca4 Wip zoomable container logic 2018-09-25 10:23:27 +09:00
Dean Herbert
56981acc92 Fix default value of dropdown 2018-09-25 05:54:42 +09:00
Dean Herbert
fbda872a53 Update line colours to match bracket type 2018-09-25 04:58:34 +09:00
Dean Herbert
40ec24c721 Increase line thickness to match design 2018-09-25 04:52:05 +09:00
Dean Herbert
756141d9ed Add basic scaling support 2018-09-25 04:51:40 +09:00
Dean Herbert
492cdb6a05 Fix namespacing 2018-09-25 04:21:48 +09:00