h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 11:27:24 +08:00
Code Issues Releases Wiki Activity
19,298 Commits 3 Branches 653 Tags 365 MiB
ba589b2139
Commit Graph

182 Commits

Author SHA1 Message Date
Dean Herbert
fcab21908b Update in line with screen changes 2019-02-17 18:20:03 +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
fdba2bffb9 Ensure last state is set correctly 2018-11-22 17:33:48 +09:00
Dean Herbert
fb05ea3de3 Fix alignment and fonts of tem intro screen 2018-11-22 16:23:44 +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
8fab241ce3 Don't show matches on showcase which are more than four days away 2018-11-18 21:15:29 +09:00
Dean Herbert
5621101d40 Adjust gameplay screen size 2018-11-18 12:39:25 +09:00
Dean Herbert
06b08cd82d Automate return to gameplay after map pool selection 2018-11-18 09:29:18 +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
Dean Herbert
584adaf77d Limit horizontal bounds of score display 2018-11-18 07:54:53 +09:00
Dean Herbert
4b047ad9cc Centralise chat display 2018-11-17 21:27:02 +09:00
Dean Herbert
852f0337dd Group map pool by mod type 2018-11-17 16:06:43 +09:00
Dean Herbert
4ae9413ee6 Add mod icons 2018-11-17 16:00:12 +09:00
Dean Herbert
9f519d7002 Actually add match score display to gameplay screen 2018-11-17 15:59:55 +09:00
Dean Herbert
49e155c2c0 Fix chat not appearing at ranking 2018-11-17 15:31:03 +09:00
Dean Herbert
5659ba6ef8 Add logo to ladder screen 2018-11-17 14:59:37 +09:00
Dean Herbert
71184c602f Show times on schedule 2018-11-17 14:55:27 +09:00
Dean Herbert
81f39c2f39 Don't show matches on schedule which don't have teams set 2018-11-17 14:35:40 +09:00
Dean Herbert
bed967b456 Add better date string formatting 2018-11-17 14:05:42 +09:00
Dean Herbert
c1e1306c97 Show controls above screens 2018-11-17 13:39:55 +09:00
Dean Herbert
87243a72d3 Add date entry for pairings 2018-11-17 12:14:15 +09:00
Dean Herbert
2ee77670ee Add date entry for groupings 2018-11-17 12:04:19 +09:00
Dean Herbert
4b74105ad9 Fix code sanity issues 2018-11-16 20:34:51 +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
5801ed7b1a Adjust spacing on map pool screen 2018-11-16 19:49:17 +09:00
Dean Herbert
e3e92f4302 Add chat IPC and gameplay screen integration 2018-11-16 19:43:54 +09:00
Dean Herbert
c9e2ee8f56 Fix masking of song bar 2018-11-16 18:14:42 +09:00
Dean Herbert
e6637532bc Add back padding 2018-11-16 12:20:21 +09:00
Dean Herbert
46e163ec5e Add score display 2018-11-15 21:28:42 +09:00
Dean Herbert
604cb4cb9e Update to support new dropdown logic 2018-11-15 14:12:41 +09:00
Dean Herbert
8eff21d128 Fix star colours being incorrect 2018-11-15 14:12:14 +09:00
Dean Herbert
be3904b647 Add win screen 2018-11-11 10:39:04 +09:00
Dean Herbert
eabcef3e12 Add schedule screen 2018-11-11 10:13:17 +09:00
Dean Herbert
949cf98d1a Adjust gameplay position ever so slightly 2018-11-11 09:23:54 +09:00
Dean Herbert
e3576572a3 Fix warmup state, automate more 2018-11-11 09:22:57 +09:00
Dean Herbert
2683b161d5 Fix missing logo 2018-11-11 09:16:46 +09:00
Dean Herbert
9c18f7a25a Fix date display 2018-11-11 09:05:36 +09:00
Dean Herbert
21bbb68636 Handle delayed contract 2018-11-11 01:50:09 +09:00
Dean Herbert
b5c2d94cc4 Avoid rendering more than one video at once 2018-11-11 01:39:02 +09:00
Dean Herbert
86423dce5f Animate song bar based on game mode 2018-11-11 01:30:21 +09:00
Dean Herbert
976180ecc2 Fix incorrect order after bans 2018-11-11 00:48:22 +09:00
Dean Herbert
629657044d Add automatic scoring 2018-11-11 00:45:48 +09:00
Dean Herbert
713038bff8 Share header area between screens 2018-11-10 17:26:21 +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
66dc7d6b02 Fix debug tools not working 2018-11-09 16:26:09 +09:00
Dean Herbert
0be2f5ac94 Add non-working warmup toggle button 2018-11-09 16:10:58 +09:00
Dean Herbert
160984719d Add team and star displays 2018-11-08 20:38:14 +09:00
Dean Herbert
ee6263f395 Fix old maps not getting cleared when switching matches 2018-11-08 20:14:50 +09:00
Dean Herbert
6ff29c1ea4 Fix non-unbinding bindable bind 2018-11-08 16:55:55 +09:00
Dean Herbert
a31507ff0e Safety check 2018-11-08 13:08:59 +09:00
Dean Herbert
bd6d3f1473 Improve appearance 2018-11-08 06:47:42 +09:00
Dean Herbert
5da6f11a14 Automate picks and bans from IPC 2018-11-08 06:36:36 +09:00
Dean Herbert
5c84c3c0a8 Add support for picks and bans 2018-11-08 06:29:04 +09:00
Dean Herbert
e4a767d656 Move control panel logic to its own class 2018-11-08 03:51:39 +09:00
Dean Herbert
3eabac0e3d Move all IPC handling to its own class 2018-11-08 01:23:00 +09:00
Dean Herbert
a0d64c1b13 Add ability to select current match 2018-11-07 01:24:35 +09:00
Dean Herbert
555d63165b Add custom font 2018-11-07 00:27:12 +09:00
Dean Herbert
53ec01d51f Perform mappings earlier in execution 2018-11-06 20:18:11 +09:00
Dean Herbert
968d39c0e6 Rearrange scenes 2018-11-06 20:13:09 +09:00
Dean Herbert
4e87288049 Add the concept of "current match" 2018-11-06 20:13:04 +09:00
Dean Herbert
ca9df94ea2 Add skeleton for gameplay screen 2018-11-06 19:27:10 +09:00
Dean Herbert
afb3b38098 Fix regression in testing logic 2018-11-06 18:32:59 +09:00
Dean Herbert
a2b28e0bf4 Add missing header 2018-11-06 16:15:03 +09:00
Dean Herbert
6f25548737 Remove now unnecessary null setters 2018-11-06 14:49:20 +09:00
Dean Herbert
9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00
Dean Herbert
fb93aea909 Use logo-less video by default 2018-11-05 23:15:30 +09:00
Dean Herbert
c7e5ae0573 Read from stable 2018-11-05 23:15:13 +09:00
Dean Herbert
7e092c6084 Read videos from storage 2018-11-04 21:15:06 +09:00
Dean Herbert
89a1414c63 Read flag name from file 2018-11-04 21:14:16 +09:00
Dean Herbert
54a02ee2d7 Add showcase screen 2018-11-04 07:12:07 +09:00
Dean Herbert
2e348edd8d Fix filename 2018-11-04 05:29:06 +09:00
Dean Herbert
a918e83b1e Add drawings screen 2018-11-04 04:58:59 +09:00
Dean Herbert
b610095ff5 Update drawings design 2018-11-04 04:58:40 +09:00
Dean Herbert
5568e9ff8a Reduce test case crashes when missing data is present 2018-10-25 01:31:24 +09:00
Dean Herbert
12c0b2c37d Add test videos and adjust alignment to match 2018-10-18 02:18:09 +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