1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-25 18:57:18 +08:00

8478 Commits

Author SHA1 Message Date
Dean Herbert
31f9d0161d
Add a comment about precision scroll behaviour 2018-06-18 03:03:09 +09:00
Dean Herbert
ae160baa6e
Merge branch 'master' into timeline-input-adjustment 2018-06-18 02:54:25 +09:00
Dean Herbert
48613ea1f6
Merge branch 'master' into timeline-markers 2018-06-18 02:09:20 +09:00
Dean Herbert
a20ec0d4cc Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:21 +09:00
Dean Herbert
e0ee5e2085 Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:16 +09:00
HoutarouOreki
faff7feef1 Remove unnecessary white space change 2018-06-15 15:03:09 +02:00
HoutarouOreki
6938adc148 Unify join time text's visual format with the web 2018-06-15 15:00:41 +02:00
HoutarouOreki
38feb7651c Set text at updateTime 2018-06-15 14:34:01 +02:00
HoutarouOreki
d122547c1e DrawableJoinDate handles "Here since the beginning" text 2018-06-15 14:28:49 +02:00
HoutarouOreki
f0fbc04d92 Adjust formats to be EN-UK 2018-06-15 14:11:21 +02:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions 2018-06-15 18:33:40 +09:00
Dean Herbert
a6437c005c
Merge branch 'master' into diffcalc-rework 2018-06-15 18:02:18 +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
Dean Herbert
db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +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
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
2ff7b4cdcf
Merge branch 'master' into catch-droplet-fix 2018-06-15 14:34:01 +09:00
Dean Herbert
036c57833b
Merge branch 'master' into conversion-test-improvements 2018-06-15 14:26:37 +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
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
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
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
8f7334874c Fix up performance calculators 2018-06-14 16:04:48 +09:00
smoogipoo
540b43313e Remove PP test cases (osu-tools/osu-server should be used instead) 2018-06-14 15:57:06 +09:00
smoogipoo
b7a06b9594 Restructure of DifficultyCalculator to cleanup mod + attribute handling 2018-06-14 15:32:07 +09:00
smoogipoo
1431ee1867 Remove unused method 2018-06-14 14:46:25 +09:00
Dean Herbert
b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +09:00
Dean Herbert
cee5be1d56 Improve precision wheel adjustment handling 2018-06-13 17:03:56 +09:00
Dean Herbert
e0b68e4e09 Fix hide re-schedule not triggering on noop state change 2018-06-13 16:47:10 +09:00
Dean Herbert
a55bf82fd9 Handle hover blocking in VolumeOverlay to ensure correct hide scheduling 2018-06-13 16:46:56 +09:00
Dean Herbert
2a18625b2c Correctly block scroll events when hovering controls 2018-06-13 16:46:27 +09:00
Dean Herbert
2cc7953421 Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls 2018-06-13 16:14:20 +09:00
Dean Herbert
0fdb04f57d Fix empty line 2018-06-13 15:43:18 +09:00
Dean Herbert
3ac90511c9
Merge branch 'master' into fix-memory-leak 2018-06-13 15:27:39 +09:00
Dean Herbert
39738a997e Add check for player screens too 2018-06-13 15:26:23 +09:00
Dan Balasescu
cbb883614a
Merge branch 'master' into catch-droplet-fix 2018-06-13 15:18:52 +09:00
Dean Herbert
14f5c814a6 Add test for WorkingBeatmap leakage 2018-06-13 15:12:10 +09:00
Dan Balasescu
0e0e64895a
Merge branch 'master' into mania-step-interval 2018-06-13 13:55:27 +09:00
Dean Herbert
a7ed3ea80b Rename alwaysVisible to explain where it comes from 2018-06-13 11:38:15 +09:00