1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 22:07:27 +08:00
Commit Graph

248 Commits

Author SHA1 Message Date
Dan Balasescu
3600b0daf0
Merge branch 'master' into fix-mod-select-overflowing 2020-02-04 11:57:54 +09:00
Dan Balasescu
76ba0b833e
Merge pull request #7716 from EVAST9919/overlay-header-ruleset-selector
Add ability to create ruleset selector in OverlayHeader
2020-02-03 19:00:12 +09:00
Dan Balasescu
c6e7603e5e
Merge branch 'master' into safe-screen-lease 2020-02-03 18:18:13 +09:00
Andrei Zavatski
81ab6d43b6 Add ability to create ruleset selector in OverlayHeader 2020-02-03 11:09:46 +03:00
Dan Balasescu
93952d438f
Merge pull request #7677 from peppy/decouple-mod-select-bindable
Decouple ModSelectOverlay from global SelectedMods
2020-02-03 16:27:47 +09:00
Joehu
583fee074f Fix mod select not showing up in mod settings test 2020-02-01 11:50:24 -08:00
Joehu
609ee26030 Fix mod select overlay not showing up in test 2020-02-01 11:41:41 -08:00
Dean Herbert
19f516e710 Ensure OsuScreen level leases are taken out synchronously 2020-01-31 19:10:44 +09:00
Dean Herbert
8e966624e0 Fix regressing tests 2020-01-30 19:55:25 +09:00
Andrei Zavatski
10e8361e7c Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-30 10:08:39 +03:00
Dean Herbert
bea20efb64
Merge branch 'master' into mod_content_centering 2020-01-30 10:34:46 +09:00
Andrei Zavatski
97fb7a5593 Add test scene 2020-01-27 15:42:46 +03:00
Andrei Zavatski
e6fa793d56 Refactor background creation in OverlayHeader 2020-01-27 15:36:19 +03:00
Dean Herbert
e37ae589ad
Merge branch 'master' into no-control-overlay-headers 2020-01-27 18:35:33 +09:00
smoogipoo
431b1489b9 Add test 2020-01-27 13:16:36 +09:00
Andrei Zavatski
7cd60e3193 Make OverlayRulesetSelector use colour provider 2020-01-26 17:07:17 +03:00
Andrei Zavatski
a72250acc6 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-26 16:52:56 +03:00
Andrei Zavatski
cd0fcfabd9 Merge master with conflicts resolved 2020-01-26 16:35:07 +03:00
Andrei Zavatski
2b941a0d52 Merge remote-tracking branch 'refs/remotes/ppy/master' into no-control-overlay-headers 2020-01-24 10:18:45 +03:00
ProTheory8
9de4424aec Removed TestModCustomisable3 2020-01-21 19:32:53 +05:00
ProTheory8
b8d2012fc3 Added test 2020-01-21 15:26:51 +05:00
Andrei Zavatski
30edd80c8c Refactor OverlayHeader hierarchy 2020-01-21 06:00:12 +03:00
Andrei Zavatski
4a5e855953 Rename test scene 2020-01-20 12:21:21 +03:00
Andrei Zavatski
17a7a75707 Merge master with conflicts resolved 2020-01-20 08:52:03 +03:00
Andrei Zavatski
11e7c8be3f Use colour schemes for OverlayRulesetSelector 2020-01-20 08:34:46 +03:00
Andrei Zavatski
6552097866 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-20 08:22:30 +03:00
Dean Herbert
3f2512295c
Merge pull request #7555 from peppy/update-framework
Update framework
2020-01-18 15:57:16 +09:00
Dean Herbert
e8e6897603 Remove unnecessary linq count usage 2020-01-18 15:27:21 +09:00
mcendu
e096688ac8
simplify some stuff 2020-01-16 17:58:47 +08:00
mcendu
4c18a67268 add test step 2020-01-15 18:24:43 +08:00
mcendu
052772cce7
add test case 2020-01-15 18:15:56 +08:00
mcendu
62615fb8c1
format 2020-01-15 18:00:14 +08:00
mcendu
a0b6cadab5
add test scene 2020-01-15 17:36:27 +08:00
Dean Herbert
14829837c4 Update namespace specifications 2020-01-10 01:38:03 +08:00
Dean Herbert
56724d2580
Merge branch 'master' into #7146 2020-01-10 01:08:20 +08:00
Dean Herbert
26c80e35fb Fix missing namespace 2020-01-09 17:17:08 +08:00
Dean Herbert
ab9603b06a Merge remote-tracking branch 'upstream/master' into #7146 2020-01-09 17:08:12 +08:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Andrei Zavatski
351aaf41d9 Fix parameter naming 2020-01-08 00:54:02 +03:00
Andrei Zavatski
eb828154ee Allow any type to be used to create TabControl 2020-01-08 00:41:52 +03:00
Bartłomiej Dach
e0cfc2f405
Merge branch 'master' into prev-button-revamp 2020-01-07 21:49:53 +01:00
smoogipoo
4a68c79137 Make tests safer against async loads / transforms 2020-01-07 13:21:25 +09:00
smoogipoo
ee15967c4a Rewrite test scene to be automated 2020-01-06 17:15:59 +09:00
Andrei Zavatski
53c8592cb9 Add test scene 2020-01-03 23:54:56 +03:00
Willy Tu
e23c71be80 Update Resolved and Cached attribute issues 2020-01-03 11:34:26 -08:00
Willy Tu
0a4e180ce7 Merge branch 'master' of github.com:ppy/osu into #7146 2020-01-03 11:32:06 -08:00
Andrei Zavatski
55777c24ce Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-ruleset-selector 2020-01-03 20:25:28 +03:00
Dean Herbert
43903b2fea Make test scene usable 2020-01-02 14:24:58 +09:00
Andrei Zavatski
2d6a07e970 Fix OverlayRulesetSelector don't have default colour 2020-01-01 23:14:26 +03:00
Andrei Zavatski
af248457b0 Implement OverlayRulesetSelector 2020-01-01 22:49:04 +03:00