h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Code Issues Releases Wiki Activity
29,182 Commits 3 Branches 661 Tags 368 MiB
9944a514da
Commit Graph

322 Commits

Author SHA1 Message Date
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08: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
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
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
31cc0d13da Use 'out var'. 2019-11-12 19:55:26 +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
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
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
Huo Yaoyuan
3ad0369d7b Resolve new diagnostics in C# 7.3 2019-10-30 23:13:11 +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
Dean Herbert
bafb429e9b Don't show video background 2019-09-23 04:49:31 +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
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +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
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
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
cffc82ce81 Add a max height for the ladder settings dropdowns 2019-06-21 15:22:56 +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
3db6913a9c Rename editor screens removing plurals 2019-06-18 15:15:28 +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
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
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
4cd6955a96 Fix GameplayScreen test not working 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
Dean Herbert
9e4f2c7eb9 Move font local 2019-06-13 19:41:01 +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
084c2252cb Use less DI where we already have access to LadderInfo 2019-05-20 14:48:33 +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
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
73d266fe10 Fix win screen being incorrectly displayed after switching matches 2019-03-02 16:32:11 +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
796f6c3092 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-03-02 13:13:51 +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
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