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

12124 Commits

Author SHA1 Message Date
KoziLord
08386d6ca4 Merge branch 'master' of https://github.com/ppy/osu 2018-05-15 12:23:36 +02: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
KoziLord
be56d8cb82 Change the parallax amount 2018-05-15 00:53:31 +02:00
KoziLord
ca05fde14c Fix the Parallax Background not filling the entire Circle Container. 2018-05-15 00:47:03 +02:00
KoziLord
95a207ef56 Fixed the parallax background missing from the space occupied by the top toolbar. 2018-05-15 00:17:42 +02: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
Dean Herbert
0234bbc37f Move definition inline 2018-05-14 19:14:17 +09:00
smoogipoo
9536c324fa Rename aborted -> fired 2018-05-14 19:08:00 +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
Dan Balasescu
f0b7ed238c
Merge pull request #2542 from peppy/overlays-dont-handle-dragstart
Stop focused overlays from handling DragStart
2018-05-14 17:58:10 +09:00
smoogipoo
027f6c3fa4 Fix instant movement not doing anything 2018-05-14 17:47:38 +09:00
smoogipoo
4ceae6ba1f Inline method 2018-05-14 17:45:11 +09:00
smoogipoo
6eb7590ab0 Make MusicController handle all movement to previous/next tracks 2018-05-14 17:42:01 +09:00
Dean Herbert
fe1c1fec0d Stop overlays from handling DragStart
This was causing weird behaviour with the key configuration section and back button in settings.
2018-05-14 15:44:19 +09:00
smoogipoo
64fba5f6d1 Proxy the ruleset cursor above the break overlay 2018-05-14 15:36:56 +09:00
smoogipoo
43409127b7 Place break overlay underneath the hud 2018-05-14 15:36:42 +09:00
Dean Herbert
1045199a17
Merge pull request #2538 from smoogipoo/fix-diffcalc-timerates
Fix performance calculation not considering time-adjustment mods
2018-05-14 15:35:22 +09:00
Dean Herbert
39970c831e
Merge branch 'master' into fix-diffcalc-timerates 2018-05-14 15:19:51 +09:00
Dean Herbert
07fc71e077
Merge pull request #2533 from peppy/fix-wedge-nullref
Fix nullref when changing ruleset at main menu
2018-05-14 15:19:35 +09:00
smoogipoo
f5068804d5 Re-enable slider distance overflow
Fixes #2467.
2018-05-14 15:14:29 +09:00