1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 06:52:56 +08:00
Commit Graph

24391 Commits

Author SHA1 Message Date
smoogipoo
8e651962c7 Fix incorrectly binding inside BDL load() 2019-12-18 17:41:30 +09:00
Dean Herbert
ada2ae2b2c Use tuple to avoid potential for incorrect display 2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf Don't clone beatmap unnecessarily 2019-12-18 17:00:35 +09:00
Dean Herbert
54572b6de9 Update selected mdos references 2019-12-18 16:42:18 +09:00
Dean Herbert
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings 2019-12-16 14:57:57 +09:00
Dean Herbert
f4ce703490
Separate path connections from control points (#7136)
Separate path connections from control points

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-16 11:37:11 +09:00
Dean Herbert
5e98f65b52
Merge branch 'master' into separate-path-connection 2019-12-16 11:16:00 +09:00
Dean Herbert
ef4718dfaf
Fix depth of cursor middle being incorrect compared other curso… (#7205)
Fix depth of cursor middle being incorrect compared other cursor elements
2019-12-15 14:43:56 +09:00
mcendu
135eb8972e
Merge branch 'master' into cursormiddle 2019-12-15 13:23:40 +08:00
Dan Balasescu
6eac5d03ad
Merge pull request #7212 from peppy/update-framework
Update framework
2019-12-15 03:49:01 +09:00
Dean Herbert
91bb851a7d Update framework 2019-12-15 03:32:50 +09:00
Dean Herbert
23ea6c1e6c
Fix crash on trying to retrieve mods from unavailable ruleset (#7211)
Fix crash on trying to retrieve mods from unavailable ruleset
2019-12-15 03:18:14 +09:00
Dean Herbert
244eb56455 Fix test ruleset availability 2019-12-15 03:01:37 +09:00
Dean Herbert
41d4609c92 Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00
Dean Herbert
63c13ca1eb
Use GetEndTime in Taiko and Mania (#7204)
Use GetEndTime in Taiko and Mania
2019-12-14 23:09:20 +09:00
mcendu
489d9dc7b5 Switch Expandtarget and "cursormiddle" 2019-12-14 18:33:56 +08:00
Huo Yaoyuan
ddb2cfc46d Use GetEndTime in Taiko and Mania 2019-12-14 18:16:13 +08:00
Dean Herbert
e96723434c
Fix error when entering multiplayer game in different ruleset (#7191)
Fix error when entering multiplayer game in different ruleset
2019-12-14 01:14:23 +09:00
Dean Herbert
b94d5bf82e Fix error when entering multiplayer game in different ruleset 2019-12-14 00:42:54 +09:00
Dean Herbert
a904660ed3
Add rate adjustment settings for all time mods (DT/HT/NC/DC/WU/… (#7121)
Add rate adjustment settings for all time mods (DT/HT/NC/DC/WU/WD)

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-13 22:39:37 +09:00
Dean Herbert
bc397a4f1d
Merge branch 'master' into adjustable-rate-mods 2019-12-13 22:23:30 +09:00
Dean Herbert
5a8b4113a2
Move available mods to global context (#7172)
Move available mods to global context

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-13 22:16:53 +09:00
Dean Herbert
59538bfd32 Merge branch 'global-available-mods' into adjustable-rate-mods 2019-12-13 21:57:27 +09:00
Dan Balasescu
ef94df917c
Add whitespace 2019-12-13 21:56:03 +09:00
smoogipoo
72ea871bff Make constructor protected 2019-12-13 21:55:20 +09:00
Dean Herbert
af15662856 Fix WindUp applying too much change 2019-12-13 21:55:07 +09:00
Dean Herbert
bc31146560 Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Dean Herbert
8052aeb238 Fix potential nullref in disposal logic 2019-12-13 21:36:50 +09:00
Dean Herbert
76aa4f9fb2 Fix code style issues 2019-12-13 21:36:50 +09:00
Dean Herbert
7fdaf338f3 Fix test logic and add regression test 2019-12-13 21:36:50 +09:00
Dean Herbert
440a8470e1 Move available mods to global context
This also tidies up ModSelectOverlay and setting creation flow in general.
2019-12-13 21:36:50 +09:00
Dean Herbert
fa7520d177
Merge pull request #7185 from peppy/update-framework
Update framework
2019-12-13 20:59:22 +09:00
Dean Herbert
4392317d3b
Merge pull request #7184 from peppy/improve-test-data-sources
Improve test data sources
2019-12-13 20:56:11 +09:00
Dean Herbert
f349e7ff78 Fix non-null ?? usage 2019-12-13 20:35:34 +09:00
Dean Herbert
34f67b9cad Update framework 2019-12-13 20:31:20 +09:00
Dean Herbert
0bbaf9b7fb Fix mod select overlay tests not running individually 2019-12-13 20:21:35 +09:00
Dean Herbert
a1f8ab1735 Fix unrequired type keyword 2019-12-13 20:13:53 +09:00
Dean Herbert
7033974733 Fix test regressions (incorrect from the start) 2019-12-13 20:13:32 +09:00
Dean Herbert
3dc2b59d2a Move variable above common bindables 2019-12-13 20:06:12 +09:00
Dean Herbert
395b058ff8 Fix OsuScreenDependencies not caching non-leased versions 2019-12-13 20:05:54 +09:00
Dean Herbert
952bc96bbf Use GameBase data sources for Beatmap/Mods/Ruleset
Sourced in via OsuScreenDependencies for management
2019-12-13 20:05:38 +09:00
unknown
3945e7403a improve tests and refactor AdvancedStats 2019-12-13 09:39:54 +08:00
unknown
ec5b506960 apply mod difficulty settings during song select 2019-12-12 23:41:46 +08:00
Dean Herbert
1cd26a0707
Lighten background during breaks (#7142)
Lighten background during breaks

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-12 21:23:07 +09:00
Dean Herbert
ecc7fdc561 Ensure a clean run on each test method 2019-12-12 21:04:56 +09:00
Dean Herbert
5e634c1183 Move test values to constants 2019-12-12 20:51:58 +09:00
Dean Herbert
7559012fb7 Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks 2019-12-12 19:55:09 +09:00
Dean Herbert
0627c814d6
Refactor DrawableRuleset to be constructed with a converted bea… (#7169)
Refactor DrawableRuleset to be constructed with a converted beatmap
2019-12-12 19:40:44 +09:00
Dean Herbert
623ab1ef3b Update time ramp preview on setting change 2019-12-12 17:38:18 +09:00
Dean Herbert
bd3fe23cee Merge branch 'fix-mod-retention' into adjustable-rate-mods 2019-12-12 17:21:15 +09:00