h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-16 04:32:57 +08:00
Code Issues Releases Wiki Activity
25,992 Commits 4 Branches 668 Tags 360 MiB
a84386ba01
Commit Graph

25992 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dean Herbert
a84386ba01 Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering 2020-02-06 14:22:52 +09:00
Dean Herbert
81cadb7875 Simplify the way multiple subscreens handle their disable states via a custom stack 2020-02-06 14:22:01 +09:00
Dean Herbert
114fd967c1 Revert "Remove leasing at a Multiplayer screen level" 
This reverts commit 304a071e39.
 2020-02-06 13:47:34 +09:00
Dean Herbert
d00b61de99 Merge branch 'master' into lounge-ruleset-filtering 2020-02-06 13:38:27 +09:00
Dean Herbert
e548a4b8dd Fix missing bind causing regression in filter 2020-02-06 13:36:49 +09:00
Dean Herbert
75eb9ca040
Merge pull request #7739 from peppy/fix-rooms-test-scene 
Fix rooms test scene not displaying anything
 2020-02-06 13:12:10 +09:00
Dean Herbert
49ec1d4a99 Fix braces style 2020-02-06 13:04:29 +09:00
Dean Herbert
43b22e3b63 Add a ruleset filtering test 2020-02-06 13:03:15 +09:00
Dean Herbert
061b8c389f Fix null search string causing an exception 2020-02-06 13:03:04 +09:00
Dean Herbert
d32bb79e5a Add simple filtering test 2020-02-06 13:03:04 +09:00
Dean Herbert
1dc7fc4a33 Fix case where playlist is empty 2020-02-06 13:01:48 +09:00
Dan Balasescu
190f870097
Merge pull request #7732 from peppy/editor-beatmap-component 
Make EditorBeatmap a drawable component
 2020-02-06 13:01:03 +09:00
Dan Balasescu
38bf14a06c
Merge branch 'master' into editor-beatmap-component 2020-02-06 12:25:33 +09:00
Dean Herbert
a79d6ff27a Change transition to better handle mass filter cases 2020-02-06 12:17:20 +09:00
Dean Herbert
304a071e39 Remove leasing at a Multiplayer screen level 2020-02-06 12:17:20 +09:00
Dean Herbert
50c4e34c92 Add ruleset to multiplayer filter criteria 2020-02-06 12:17:20 +09:00
Dean Herbert
7f0a134bc8 Bring test scene structure up-to-date 2020-02-06 12:17:05 +09:00
Dean Herbert
00edc7e66f Fix RoomsContainer test scene not displaying 2020-02-06 12:14:17 +09:00
Dean Herbert
96986bf5fc Remove beat divisor from ctor and use DI instead 2020-02-05 17:48:21 +09:00
Dean Herbert
63c595ed97 Make EditorBeatmap a component and move UpdateHitObject to it 2020-02-05 17:48:21 +09:00
Dan Balasescu
e119040d5d
Merge pull request #7726 from EVAST9919/rankings-spotlights-table 
Add API to get rankings data for selected spotlight
 2020-02-05 14:46:05 +09:00
Dan Balasescu
af4f3e5fff
Merge branch 'master' into rankings-spotlights-table 2020-02-05 13:42:26 +09:00
Dan Balasescu
5277ce5370
Merge pull request #7725 from recapitalverb/top-score-statistics 
Adjust TopScoreStatisticsSection to closer match web design
 2020-02-05 12:10:11 +09:00
Andrei Zavatski
f8ad9476ef Adjust test step name 2020-02-04 21:03:17 +03:00
Andrei Zavatski
a9cfade2f4 Adjust null handling 2020-02-04 21:02:10 +03:00
Bartłomiej Dach
4ea9efd92e Enforce column ordering 2020-02-04 17:59:32 +01:00
recapitalverb
833bb28dcf Adjust separator position between top and bottom content 2020-02-04 22:38:25 +07:00
recapitalverb
0cba1a357f Adjust padding on DrawableTopScore 2020-02-04 21:56:22 +07:00
recapitalverb
bd815cd81b Use minWidth on more columns to further match web 2020-02-04 21:55:48 +07:00
recapitalverb
1c16ab1813 Use better colours 2020-02-04 21:55:20 +07:00
recapitalverb
f112760b00 Revert column separator height to 2 2020-02-04 21:55:04 +07:00
Andrei Zavatski
f889f2435b Add test step to TestSceneRankingsTable 2020-02-04 16:20:15 +03:00
Andrei Zavatski
37992e99f9 API implementation 2020-02-04 16:04:06 +03:00
recapitalverb
5030b66092 Adjust width of statistics columns 2020-02-04 19:59:11 +07:00
recapitalverb
a8faee91d8 Use minWidth on pp column 2020-02-04 19:54:57 +07:00
recapitalverb
556a4e64cb Use minimum width on statistics columns 2020-02-04 19:46:14 +07:00
recapitalverb
8f9917238e Add optional minimum width to InfoColumn 2020-02-04 19:45:08 +07:00
recapitalverb
4f312ae6bc Adjust InfoColumn spacing 2020-02-04 19:43:14 +07:00
recapitalverb
c12fc67887 Change InfoColumn title font weight 2020-02-04 19:42:37 +07:00
recapitalverb
3571c2b617 Rearrange children in TopScoreStatisticsSection 2020-02-04 19:41:44 +07:00
recapitalverb
1f2d710ef4
Merge pull request #1 from ppy/master 
Merge ppy:master into master
 2020-02-04 19:25:44 +07:00
Dan Balasescu
d627d2f74e
Merge pull request #7724 from EVAST9919/beatmap-overlay-recolour 
Update BeatmapSetOverlay to match web design
 2020-02-04 21:18:20 +09:00
Andrei Zavatski
5f63ef3bc1 Fix crashing test 2020-02-04 14:52:26 +03:00
Andrei Zavatski
cff619b0e4 Adjust overlay layout 2020-02-04 14:46:22 +03:00
Andrei Zavatski
f30cdab025 Update Scores section 2020-02-04 14:35:04 +03:00
Andrei Zavatski
34091103e3 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-recolour 2020-02-04 14:17:24 +03:00
Andrei Zavatski
0e54e0e092 Recolour DrawableTopScore 2020-02-04 14:17:22 +03:00
Andrei Zavatski
873eda3bb5 Recolour info section 2020-02-04 14:00:18 +03:00
Dan Balasescu
f1c7130805
Merge pull request #7722 from EVAST9919/rankings-overlay-update 
Update RankingsOverlay in line with the web design
 2020-02-04 19:36:03 +09:00
Andrei Zavatski
c3bd6c3f7f Remove no longer used field 2020-02-04 11:21:21 +03:00