1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 03:55:30 +08:00
Commit Graph

12447 Commits

Author SHA1 Message Date
Dean Herbert
07e00fb7a1
Merge pull request #2556 from smoogipoo/more-diffcalc-improvements
Bring osu! difficulty calculation on par with osu!stable
2018-05-15 22:52:43 +09:00
smoogipoo
3f67d04429 Cap CS to 10 also 2018-05-15 21:57:08 +09:00
smoogipoo
cf08293be1 Remove extra newline 2018-05-15 21:49:44 +09:00
smoogipoo
4101b8ddde Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements 2018-05-15 21:31:58 +09:00
smoogipoo
22f3bee55a Fix incorrect iteration over difficulty sections 2018-05-15 21:26:06 +09:00
smoogipoo
bc197a88e1 Fix slider length calculation including slider head 2018-05-15 21:25:33 +09:00
smoogipoo
1acfc1bbab Fix ModHardRock not properly clamping Drain/OD 2018-05-15 21:25:20 +09:00
smoogipoo
1b5c151e0e Fix DeltaTime being capped incorrectly 2018-05-15 21:25:02 +09:00
smoogipoo
49c36787d7 Remove triangle pattern and remove not-implemented reading strain 2018-05-15 21:24:41 +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
457b98e68c
Merge pull request #2483 from smoogipoo/disable-mouse-buttons
Add keybind to disable mouse buttons
2018-05-15 19:38:50 +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
da4c839119
Merge pull request #2540 from smoogipoo/enable-distance-overflow
Re-enable slider curve lengthening
2018-05-15 19:17:19 +09:00
Dean Herbert
6bf1092c7d
Merge branch 'master' into enable-distance-overflow 2018-05-15 18:56:51 +09:00
Dean Herbert
d6565fca0e
Merge pull request #2555 from smoogipoo/namespace-cleanup
Re-namespace performance/difficulty calculators
2018-05-15 18:30:24 +09:00
Dean Herbert
0e0cc8bb69
Merge branch 'master' into namespace-cleanup 2018-05-15 18:10:48 +09:00
Dean Herbert
d7d3838ad6
Merge pull request #2524 from smoogipoo/convert-object-hitwindows
Use osu!stable hitwindows for converted hitobjects
2018-05-15 17:48:08 +09:00
smoogipoo
803200ff6a Apply similar changes to other rulesets 2018-05-15 17:40:19 +09:00
smoogipoo
995fda9b6f Move base classes to osu.Game.Rulesets.Difficulty namespace 2018-05-15 17:38:08 +09:00
smoogipoo
9fd972e0a3 Rename OsuDifficulty -> Difficulty 2018-05-15 17:36:29 +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
b40c55868e
Merge pull request #2551 from smoogipoo/score-parser-deriving
Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval
2018-05-15 15:50:42 +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
f3d3d777fa
Merge pull request #2543 from smoogipoo/beatmap-delete-fix
Fix deleted beatmaps still being accessible in MusicController
2018-05-15 14:59:20 +09:00
Dean Herbert
5fee471307
Merge branch 'master' into beatmap-delete-fix 2018-05-15 14:49:09 +09:00
Dean Herbert
b32357131a
Merge branch 'master' into score-parser-deriving 2018-05-15 14:37:56 +09:00
Dean Herbert
8f34468176
Merge pull request #2552 from smoogipoo/pp-hd-change
Port osu-performance HD AR fix
2018-05-15 14:13:45 +09:00
smoogipoo
10e2f74538 Port osu-performance HD AR fix 2018-05-15 11:53:11 +09:00
smoogipoo
fe2ea17e7f Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval 2018-05-15 11:42:40 +09:00
ocboogie
4055a6fc0c
Merge branch 'master' into ruleset-keybindings 2018-05-14 15:39:10 -07:00
Roman Kapustin
f2f2fb8c73 Use both OnKeyDown and GlobalAction.Back 2018-05-14 22:09:09 +03:00
Roman Kapustin
e802b722f0 Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
This reverts commit 44bbb8700e.
2018-05-14 20:27:05 +03:00
Dean Herbert
92c9c2d63a
Merge pull request #2539 from smoogipoo/fix-drumroll-judgements
Fix drumroll completions always giving GREAT judgements
2018-05-14 21:26:18 +09:00
Dean Herbert
0fbdbdd2ab
Merge branch 'master' into fix-drumroll-judgements 2018-05-14 21:14:20 +09:00
Dean Herbert
15d6c1f0e6
Merge pull request #2375 from aQaTL/mapping-del
Change mapping delete key to shift+delete to allow binding delete key
2018-05-14 21:13:39 +09:00
Dean Herbert
7507d18a93
Merge branch 'master' into mapping-del 2018-05-14 20:56:12 +09:00
Dean Herbert
a5caad1eb1
Merge pull request #2544 from smoogipoo/fix-testruleset-issues
Fix possibility of test rulesets being discovered from assemblies
2018-05-14 20:54:51 +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
Dean Herbert
5d3449d55d
Merge pull request #2541 from smoogipoo/hud-above-letterbox
Reduce elements hidden by letterboxing break overlays
2018-05-14 19:45:25 +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
Dan Balasescu
21ed2750cd
Merge pull request #2514 from peppy/exit-hold-confirmation
Implement a hold-to-confirm screen when exiting game using escape key
2018-05-14 19:29:09 +09:00
ocboogie
d441fd53b9
Merge branch 'master' into ruleset-keybindings 2018-05-14 03:27:35 -07:00
smoogipoo
17861c2a16 Display "no key bound" when no shortcut 2018-05-14 19:20:53 +09:00