Dan Balasescu
|
8f4d62ec25
|
Merge pull request #1955 from fangerm/license-year
Update license year
|
2018-01-23 09:36:58 +09:00 |
|
Felix Ang
|
d294fcfb0b
|
Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?)
|
2018-01-22 18:42:03 +01:00 |
|
Felix Ang
|
423559ec6c
|
Update license year.
|
2018-01-22 18:22:38 +01:00 |
|
Dan Balasescu
|
f5def7bb0a
|
Merge pull request #1952 from peppy/catch-autoplay-advanced
Add more human-like catch autoplay support
|
2018-01-22 19:39:45 +09:00 |
|
Dean Herbert
|
32b540268e
|
Add more human-like catch autoplay support
Closes #1611
|
2018-01-22 18:46:59 +09:00 |
|
Dean Herbert
|
58b5e2c01b
|
Merge pull request #1939 from Aergwyn/direct-show-deleted-sets
Allow re-downloading of beatmaps pending deletion in osu!direct
|
2018-01-22 17:16:23 +09:00 |
|
Dean Herbert
|
95f941163b
|
Merge branch 'master' into direct-show-deleted-sets
|
2018-01-22 17:08:10 +09:00 |
|
Dean Herbert
|
30987f2f71
|
Merge pull request #1948 from peppy/fix-user-download-cancel
Don't show error messages when a download is user-cancelled
|
2018-01-22 17:07:32 +09:00 |
|
Dan Balasescu
|
73799832ef
|
Merge branch 'master' into direct-show-deleted-sets
|
2018-01-22 16:54:32 +09:00 |
|
Dean Herbert
|
a931d6e381
|
Merge branch 'master' into fix-user-download-cancel
|
2018-01-22 16:27:26 +09:00 |
|
Dean Herbert
|
3c9bf4df29
|
Merge pull request #1947 from peppy/fix-downloads-during-import
Keep downloads active until their associated import operation finishes
|
2018-01-22 16:27:17 +09:00 |
|
Aergwyn
|
82c8822888
|
we need to go back
reverted change and instead check `DeletePending` when retrieving existing online IDs
|
2018-01-22 08:04:14 +01:00 |
|
Dean Herbert
|
56c001fd29
|
Merge branch 'master' into fix-downloads-during-import
|
2018-01-22 15:43:39 +09:00 |
|
Dean Herbert
|
85d1e81a92
|
Merge pull request #1946 from peppy/better-direct-progress-bar
Continue showing progress bar on direct panels when importing
|
2018-01-22 15:43:24 +09:00 |
|
Dan Balasescu
|
d81fb9ef0d
|
Merge branch 'master' into better-direct-progress-bar
|
2018-01-22 15:03:34 +09:00 |
|
Dean Herbert
|
723f31815a
|
Merge pull request #1949 from smoogipoo/disable-waveform-testcase
Disable TestCaseWaveform
|
2018-01-22 15:03:23 +09:00 |
|
Dean Herbert
|
86769a521c
|
Merge branch 'master' into disable-waveform-testcase
|
2018-01-22 14:25:53 +09:00 |
|
Dan Balasescu
|
152475858b
|
Merge branch 'master' into fix-downloads-during-import
|
2018-01-22 14:25:24 +09:00 |
|
Dan Balasescu
|
20be4bbbcd
|
Merge branch 'master' into better-direct-progress-bar
|
2018-01-22 14:25:23 +09:00 |
|
Dan Balasescu
|
2e2fc4be57
|
Merge pull request #1938 from Shawdooow/overall-difficulty
Overall difficulty
|
2018-01-22 14:25:19 +09:00 |
|
Dean Herbert
|
410cd0c7fb
|
Merge branch 'master' into disable-waveform-testcase
|
2018-01-22 13:53:59 +09:00 |
|
Dean Herbert
|
3d4e2d400c
|
Remove unused using
|
2018-01-22 13:52:10 +09:00 |
|
Dan Balasescu
|
81635c8310
|
Merge branch 'master' into overall-difficulty
|
2018-01-22 13:50:37 +09:00 |
|
Dean Herbert
|
1200ee5a54
|
Merge pull request #1937 from peppy/resume-audio-after-download
Ensure previews stop playing when they are removed from the draw hierarchy
|
2018-01-22 13:50:16 +09:00 |
|
smoogipoo
|
4780c3f8c6
|
Disable TestCaseWaveform
|
2018-01-22 13:41:47 +09:00 |
|
Dean Herbert
|
53e40a77dc
|
Don't show error messages when a download is user-cancelled
Resolves #1941.
|
2018-01-22 13:25:49 +09:00 |
|
smoogipoo
|
9405f349fc
|
Update framework
|
2018-01-22 13:21:35 +09:00 |
|
Dean Herbert
|
88beee2d1f
|
Keep downloads active until their associated import operation finishes
This avoids race conditions where a second download can potentially be started while the first is still active.
|
2018-01-22 13:20:04 +09:00 |
|
Dean Herbert
|
060d80efbe
|
Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
|
2018-01-22 13:05:07 +09:00 |
|
Shawdooow
|
29466438a3
|
fix values
|
2018-01-19 20:58:43 -05:00 |
|
Shawdooow
|
c29eea870d
|
correct values
|
2018-01-19 20:56:41 -05:00 |
|
Aergwyn
|
596044e19d
|
show beatmapsets with pending deletion in osu!direct
|
2018-01-19 17:25:32 +01:00 |
|
Shawdooow
|
e109d5fe20
|
fix slider heads
|
2018-01-19 11:13:49 -05:00 |
|
Shawdooow
|
4d1142a0ce
|
overall difficulty
|
2018-01-19 11:11:28 -05:00 |
|
Shawdooow
|
f0dbf2e18c
|
Merge remote-tracking branch 'refs/remotes/ppy/master'
|
2018-01-19 11:04:17 -05:00 |
|
Dean Herbert
|
652f273961
|
Ensure previews stop playing when they are removed from the draw hierarchy
|
2018-01-19 15:46:42 +09:00 |
|
Dan Balasescu
|
64c32f5715
|
Merge pull request #1926 from Aergwyn/preview-fixes
Minor preview fixes
|
2018-01-19 00:12:41 +09:00 |
|
Dan Balasescu
|
250e936099
|
Merge branch 'master' into preview-fixes
|
2018-01-19 00:03:47 +09:00 |
|
Aergwyn
|
56619ae926
|
use ternary expression
|
2018-01-18 15:53:53 +01:00 |
|
Dan Balasescu
|
66c1568fd2
|
Merge pull request #1934 from peppy/fix-repeat-point-snaking
Fix repeat points not following slider snaking correctly
|
2018-01-18 23:52:46 +09:00 |
|
smoogipoo
|
6908597b95
|
Fix inverted ternary
See #1935 - repeat index 1 is at the end of the slider, not the start.
|
2018-01-18 23:44:00 +09:00 |
|
Dan Balasescu
|
46ba2cda10
|
Remove unused using
|
2018-01-18 21:19:06 +09:00 |
|
Dean Herbert
|
1a83770a06
|
Fix incorrect math
|
2018-01-18 21:16:15 +09:00 |
|
Dean Herbert
|
065d2a4887
|
Add licence header
|
2018-01-18 21:12:53 +09:00 |
|
Dean Herbert
|
01ff1584c2
|
Fix repeat points not following slider snaking correctly
|
2018-01-18 21:06:47 +09:00 |
|
Dan Balasescu
|
cc6f541374
|
Merge pull request #1932 from peppy/fix-slider-tick-sample-doubling
Fix slider samples playing twice when additions are present
|
2018-01-18 20:58:50 +09:00 |
|
Dean Herbert
|
e2965e1682
|
Remove unused using
|
2018-01-18 20:46:57 +09:00 |
|
Dean Herbert
|
063767e381
|
Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
|
2018-01-18 20:37:46 +09:00 |
|
Dean Herbert
|
97884e1d05
|
Remove unnecessary null checks
|
2018-01-18 19:57:49 +09:00 |
|
Dean Herbert
|
b4f2bea37b
|
Fix slider samples playing twice when additions are present
|
2018-01-18 19:50:26 +09:00 |
|