1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 12:47:25 +08:00
Commit Graph

7788 Commits

Author SHA1 Message Date
smoogipoo
e6e3758304 Fix HR mod affecting original beatmap difficulty
Fixes #2575.
2018-05-18 18:11:52 +09:00
Dean Herbert
6c00046835
Merge branch 'master' into mania-performance-calculator 2018-05-18 12:34:49 +09:00
Dean Herbert
8e784d9104
Merge branch 'master' into fix-conversion-hitwindows 2018-05-18 11:59:16 +09:00
DrabWeb
ebfbe58abb Move Header breadcrumbs to a subclass. 2018-05-17 06:19:55 -03:00
Dean Herbert
d20011ba58 Fix an endless feedback loop 2018-05-17 17:56:29 +09:00
Dean Herbert
7c9d3c9742
Merge branch 'master' into multiplayer-base-screen 2018-05-17 17:41:31 +09:00
smoogipoo
43cdbec0a3 Fix hold note hitwindow lenience 2018-05-17 13:59:04 +09:00
smoogipoo
f67d263596 Move ruleset-specific hitwindows to post-converted hitobjects 2018-05-17 13:35:15 +09:00
Dean Herbert
d36c2686c9
Merge branch 'master' into beatmap-parsing-performance 2018-05-17 13:28:35 +09:00
smoogipoo
397d93660a Don't deep-clone beatmapinfo/control points 2018-05-17 13:17:33 +09:00
DrabWeb
650d40f57f Merge https://github.com/ppy/osu into multiplayer-base-screen 2018-05-17 00:34:40 -03:00
smoogipoo
c67f372560 Don't create nested hitobjects unless absolutely required 2018-05-17 12:29:33 +09:00
Dean Herbert
47cd9065bf
Merge branch 'master' into screen-breadcrumbs 2018-05-16 18:42:17 +09:00
smoogipoo
0f817d18d4 Add explanatory comment 2018-05-16 13:59:51 +09:00
Dan Balasescu
ad81357fb5
Merge branch 'master' into fix-hitobject-order 2018-05-16 13:33:27 +09:00
Dean Herbert
452564d0e0
Merge branch 'master' into screen-breadcrumbs 2018-05-16 13:31:38 +09:00
smoogipoo
cf44357bdb Use a stable sort for hitobjects 2018-05-16 13:30:48 +09:00
smoogipoo
8d8b7e6fa2 Fix conversion tests for ruleset-specific beatmaps not working
TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...
2018-05-16 13:09:48 +09:00
DrabWeb
1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5 Add multiplayer screen header. 2018-05-15 20:34:14 -03:00
DrabWeb
b9d99b5f40 Fix nullref when exiting the last screen. 2018-05-15 19:42:50 -03:00
smoogipoo
de63a1b578 Remove construction of new ruleset 2018-05-16 01:43:58 +09:00
Dean Herbert
c0c449e453
Remove unused using 2018-05-15 22:53:33 +09:00
smoogipoo
3f67d04429 Cap CS to 10 also 2018-05-15 21:57:08 +09:00
smoogipoo
4101b8ddde Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements 2018-05-15 21:31:58 +09:00
smoogipoo
1acfc1bbab Fix ModHardRock not properly clamping Drain/OD 2018-05-15 21:25:20 +09:00
Dean Herbert
28df77e838 Simplify code and remove generic 2018-05-15 21:10:26 +09:00
Dean Herbert
0325b1bd7a Remove unused class 2018-05-15 19:42:30 +09:00
Dean Herbert
0def847f60
Merge branch 'master' into screen-breadcrumbs 2018-05-15 19:39:03 +09:00
Dean Herbert
fc192c8998 Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons 2018-05-15 19:23:51 +09:00
Dean Herbert
6bf1092c7d
Merge branch 'master' into enable-distance-overflow 2018-05-15 18:56:51 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
Dean Herbert
e39af1c906
Merge branch 'master' into convert-object-hitwindows 2018-05-15 17:33:27 +09:00
Dean Herbert
6d87ff2595
Merge branch 'master' into enable-distance-overflow 2018-05-15 16:18:17 +09:00
Dean Herbert
f2580e5656
Merge branch 'master' into score-parser-deriving 2018-05-15 15:42:01 +09:00
smoogipoo
1ee68c1c54 Make LegacyScoreParser abstract 2018-05-15 15:28:46 +09:00
Dean Herbert
5fee471307
Merge branch 'master' into beatmap-delete-fix 2018-05-15 14:49:09 +09:00
smoogipoo
fe2ea17e7f Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval 2018-05-15 11:42:40 +09:00
Dean Herbert
7507d18a93
Merge branch 'master' into mapping-del 2018-05-14 20:56:12 +09:00
Dean Herbert
4a92d1ddb6
Merge branch 'master' into fix-testruleset-issues 2018-05-14 20:21:49 +09:00
Dean Herbert
addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00
Dan Balasescu
d40efd3134
Merge branch 'master' into fix-testruleset-issues 2018-05-14 19:39:56 +09:00
smoogipoo
47cf4f27fb Fix possibility of test rulesets being discovered from assemblies 2018-05-14 19:39:23 +09:00
Dean Herbert
28edf3bce7
Merge branch 'master' into hud-above-letterbox 2018-05-14 19:31:39 +09:00
smoogipoo
17861c2a16 Display "no key bound" when no shortcut 2018-05-14 19:20:53 +09:00
Dean Herbert
0234bbc37f Move definition inline 2018-05-14 19:14:17 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
smoogipoo
115c2dc239 Move hud below the skip button 2018-05-14 18:02:18 +09:00
smoogipoo
027f6c3fa4 Fix instant movement not doing anything 2018-05-14 17:47:38 +09:00