1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 06:42:54 +08:00
Commit Graph

24374 Commits

Author SHA1 Message Date
Dean Herbert
8168872952 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 13:28:21 +09:00
Dean Herbert
a871ec77a0
Use beatmap background in editor (#7167)
Use beatmap background in editor
2019-12-12 13:26:39 +09:00
Dean Herbert
606bd33aa6 Use beatmap background in editor 2019-12-12 13:04:32 +09:00
Dean Herbert
65c8855644
Remove abstract ScoreProcessor class (#7153)
Remove abstract ScoreProcessor class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-12 12:00:00 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks 2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor 2019-12-12 11:36:45 +09:00
Salman Ahmed
035a53cb9e Schedule SetUp() 2019-12-12 01:10:43 +03:00
Salman Ahmed
61265ed452 Increase the waiting steps 2019-12-12 00:52:33 +03:00
Salman Ahmed
4f6b85e5ea Add test ensuring correct break lightening behaviour 2019-12-12 00:32:39 +03:00
Salman Ahmed
bc02cfc2e2 TestSceneUserDimContainer -> TestSceneUserDimBackgrounds 2019-12-12 00:30:16 +03:00
Dean Herbert
e6102200a8 Merge remote-tracking branch 'upstream/master' into filesafety 2019-12-12 01:59:57 +09:00
Dean Herbert
052d0f4039
Implement basic layout for rankings overlay (#7017)
Implement basic layout for rankings overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-11 20:06:13 +09:00
smoogipoo
40f918dce6 Remove unused using 2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed Remove time ramp and rate adjust mod incompatibility 2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff Refactor ModNightcore/ModDaycore 2019-12-11 19:43:32 +09:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods 2019-12-11 19:28:59 +09:00
Dean Herbert
697e200856
Move control point removal to SliderSelectionBlueprint (#7154)
Move control point removal to SliderSelectionBlueprint
2019-12-11 19:27:53 +09:00
Dan Balasescu
9963d18d17
Add whitespace 2019-12-11 19:13:04 +09:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor 2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods
Add per-mod settings
2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dean Herbert
23959f3a3c Move control point removal to SliderSelectionBlueprint 2019-12-11 18:58:35 +09:00
Dean Herbert
9831e3ad6b
Add right-click menu item to change control point type (#7127)
Add right-click menu item to change control point type

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 18:57:15 +09:00
Dean Herbert
b28d029cb9
Don't automatically pause when window is inactive if in break t… (#7150)
Don't automatically pause when window is inactive if in break time

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-11 18:56:55 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods 2019-12-11 18:52:00 +09:00
Dan Balasescu
bad7b4eecf
Merge branch 'master' into no-pause-during-breaks 2019-12-11 18:20:50 +09:00
Dean Herbert
d82ba3e7f7 Curve -> Curve type 2019-12-11 18:20:28 +09:00
Dean Herbert
03040d1750 Don't show inherit menu item when first control point is selected 2019-12-11 18:18:16 +09:00
Dean Herbert
97ca2e2753 Add missing bezier option to menu 2019-12-11 17:58:59 +09:00
smoogipoo
48f1dad4aa Remove abstract ScoreProcessor class 2019-12-11 17:25:06 +09:00
Huo Yaoyuan
cffeceb229 Remove unnecessary comment. 2019-12-11 16:24:22 +08:00
Dean Herbert
93a6827844
Add VS launcher profile for tournament client (#7140)
Add VS launcher profile for tournament client
2019-12-11 17:16:22 +09:00
Huo Yaoyuan
b86a3dbfab PathStandardise -> ToStandardisedPath 2019-12-11 16:06:56 +08:00
Huo Yaoyuan
6b3c7c8421 Remove usages of FileSafety class. 2019-12-11 16:05:35 +08:00
Dean Herbert
cda6757f52
Merge branch 'master' into path-type-menuitem 2019-12-11 16:43:55 +09:00
Dean Herbert
c126cd8b01
Refactor path visualisers with bindables (#7122)
Refactor path visualisers with bindables

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 16:42:45 +09:00
Dean Herbert
632b1b9ee9
Merge branch 'master' into path-visualiser-refactor 2019-12-11 16:24:45 +09:00
Dean Herbert
11dc705892
Exclude "cursormiddle" from click expanding animation (#7118)
Exclude "cursormiddle" from click expanding animation

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-11 16:24:34 +09:00
Dean Herbert
d8cebd20ed Add xmldoc 2019-12-11 16:06:20 +09:00
Dean Herbert
86dac28dcb Merge remote-tracking branch 'upstream/master' into cursor-expand 2019-12-11 16:06:13 +09:00
Dean Herbert
274958669c Add early assert as sanity check 2019-12-11 15:47:41 +09:00
Dean Herbert
75f9250645 Don't automatically pause when window is inactive if in break time 2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063 Add failing test 2019-12-11 15:46:07 +09:00
Dean Herbert
ae0121c30f
Fix some weird private field names (#7149)
Fix some weird private field names
2019-12-11 15:02:24 +09:00
Dean Herbert
9ebad16436 Fix logic regression 2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11 Fix some weird private field names 2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f Merge branch 'customized-mods' into adjustable-rate-mods 2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f Fix US english 2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0 Simplify settings update logic 2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa Fix failing tests 2019-12-10 23:06:13 +03:00