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

13672 Commits

Author SHA1 Message Date
Dean Herbert
eac5db5dbc
Merge pull request #2812 from peppy/droplets-should-bounce
Fix droplets not bouncing off catcher's plate immediately
2018-06-15 17:52:28 +09:00
smoogipoo
99e28b6efa No reason for beatmap conversion tests to be internal 2018-06-15 17:39:33 +09:00
Dan Balasescu
0ba80fad60
Merge branch 'master' into droplets-should-bounce 2018-06-15 17:34:54 +09:00
Dan Balasescu
d7353135de
Merge pull request #2810 from peppy/remove-migrate-exception
Remove custom migration exception
2018-06-15 17:34:46 +09:00
Dean Herbert
5d105cd08d Avoid errors being logged when importing beatmaps while logged out 2018-06-15 17:23:03 +09:00
Dan Balasescu
234ed04cdd
Merge branch 'master' into remove-migrate-exception 2018-06-15 17:22:34 +09:00
Dan Balasescu
ee88444be5
Merge pull request #2813 from peppy/fix-music-controller-drag
Fix music controller draggability
2018-06-15 17:22:29 +09:00
Dean Herbert
db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +09:00
Dan Balasescu
87d69b93a6
Merge pull request #2792 from peppy/fix-volume-pixellation
Fix pixellation of volume meter progress bars
2018-06-15 17:07:50 +09:00
Dan Balasescu
40daa87f22
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:07:25 +09:00
Dan Balasescu
aaf3ef240e
Remove easily-confused comment 2018-06-15 17:07:07 +09:00
Dean Herbert
8b5a9c3236
Merge branch 'master' into fix-volume-pixellation 2018-06-15 16:45:15 +09:00
Dean Herbert
e8fcc01ca4
Merge pull request #2807 from smoogipoo/mania-conversion-fixes
Fix a few osu!mania beatmap conversion edge cases
2018-06-15 16:45:10 +09:00
Dean Herbert
f7b2da852f
Merge branch 'master' into mania-conversion-fixes 2018-06-15 16:33:46 +09:00
Dean Herbert
a2950b1d80 Fix incorrect comment 2018-06-15 16:12:18 +09:00
Dean Herbert
1c27ef644a Fix music controller drag activating from anywhere on the screen 2018-06-15 16:12:11 +09:00
Dean Herbert
149d94116b Fix droplets not bouncing off catcher's plate immediately 2018-06-15 15:44:47 +09:00
Dean Herbert
2ff7b4cdcf
Merge branch 'master' into catch-droplet-fix 2018-06-15 14:34:01 +09:00
Dean Herbert
3fcaf52378
Merge pull request #2806 from smoogipoo/conversion-test-improvements
Extend the testability of beatmap conversions
2018-06-15 14:33:46 +09:00
Dean Herbert
036c57833b
Merge branch 'master' into conversion-test-improvements 2018-06-15 14:26:37 +09:00
Dean Herbert
2819a283f7
Merge pull request #2811 from Joehuu/remove-from-prefix
Remove "from" prefix from sources on direct panels
2018-06-15 14:26:30 +09:00
Dean Herbert
e2a4d6c15f
Merge branch 'master' into remove-from-prefix 2018-06-15 14:19:36 +09:00
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dan Balasescu
98cafa106f
Merge branch 'master' into fix-volume-pixellation 2018-06-15 13:44:18 +09:00
Dan Balasescu
dea5143028
Merge pull request #2801 from peppy/fix-juice-explosions
Fix combos ending with JuiceStreams never leaving the catcher's plate
2018-06-15 13:43:03 +09:00
Dean Herbert
4a19f22b3d Remove custom migration exception
This was hiding the true error message from ever hitting logs.
Made to help disagnose #2711.
2018-06-15 13:38:42 +09:00
smoogipoo
9709a40c54 Fix conversion test failing 2018-06-14 21:46:47 +09:00
smoogipoo
b63e9f29d4 Merge branch 'conversion-test-improvements' into catch-droplet-fix 2018-06-14 21:38:16 +09:00
Dean Herbert
d259b31893 Fix empty line 2018-06-14 21:38:08 +09:00
Dean Herbert
cb73f215ac Add check for player screens too 2018-06-14 21:38:08 +09:00
Dean Herbert
caeddc861a Add test for WorkingBeatmap leakage 2018-06-14 21:38:08 +09:00
Dean Herbert
b97c415c50 Fix memory leak due to incorrect binding 2018-06-14 21:38:08 +09:00
smoogipoo
e840083ab4 Oops fix incorrectly changed file 2018-06-14 21:38:08 +09:00
smoogipoo
31bd59442f Remove banana positioning comment 2018-06-14 21:38:08 +09:00
smoogipoo
6867a398ca Add one more test case 2018-06-14 21:38:08 +09:00
smoogipoo
ced4e61b54 Adjust expected output with spinner changes 2018-06-14 21:38:08 +09:00
smoogipoo
e1f5498924 Discarding 3 times is correct 2018-06-14 21:38:08 +09:00
smoogipoo
250e8645e1 finalisePosition -> applyPositionOffsets 2018-06-14 21:38:08 +09:00
smoogipoo
9b403b0053 Fix non-catch beatmaps not getting properly converted
Because Osu.ConvertSpinner implements IHasXPosition.
2018-06-14 21:38:08 +09:00
smoogipoo
a97a7e13bd Rework RNG discarding comment 2018-06-14 21:38:08 +09:00
smoogipoo
cafdbc2d25 Fix discarding too many RNG values, and add test 2018-06-14 21:38:08 +09:00
smoogipoo
a4d2364083 Add one more newline 2018-06-14 21:29:08 +09:00
smoogipoo
b99b520656 Allow convertmapping to be extended 2018-06-14 21:25:33 +09:00
smoogipoo
024d2abfe0 Always generate mappings/convert values as soon as objects are converted
# Conflicts:
#	osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
2018-06-14 21:25:23 +09:00
smoogipoo
8d0e7abdd6 Some rulesets don't have a beatmap processor 2018-06-14 21:23:11 +09:00
smoogipoo
5e66b02108 Process beatmap before generating mappings 2018-06-14 21:22:56 +09:00
smoogipoo
fd84afb89b Fix non-inverted calculation 2018-06-14 19:38:48 +09:00
smoogipoo
a3bf16e481 Fix missing convert type 2018-06-14 19:37:32 +09:00
smoogipoo
b25a6a33cc Fix 1K breaking hitcircle / slider conversions 2018-06-14 19:37:21 +09:00
smoogipoo
08b9cf75e9 Don't compute keymod difficulties for mania-specific beatmaps
These don't affect the number of keys in the beatmap at all for mania-specific beatmaps.
2018-06-14 17:10:08 +09:00