1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 12:02:54 +08:00
Commit Graph

10650 Commits

Author SHA1 Message Date
Michael Manis
b98d8361bd Use obtained value for displayed name. 2018-01-21 23:59:35 -05:00
Michael Manis
35e7399bef Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix 2018-01-21 23:56:16 -05: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
smoogipoo
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +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
smoogipoo
b4e1872322 osu!-side changes in-line with framework BDL cache changes 2018-01-22 12:56:30 +09:00
Michael Manis
530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
Michael Manis
964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
Michael Manis
806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
Michael Manis
ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00
TocoToucan
e88f514cf4 Resolve merge conflicts 2018-01-21 18:32:21 +03:00
TocoToucan
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
aQaTL
c4feb67bce
Using field properties to set mute / unmute instead of separate methods 2018-01-20 11:45:04 +01: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
為什麼
feb79ff9e7
Merge branch 'master' into mania_stage_fix 2018-01-19 20:08:24 +08:00
Dean Herbert
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +09:00
aQaTL
4a85266fca
Using BindableBool to mute the volume when it's value changes 2018-01-18 17:23:02 +01: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
smoogipoo
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
Dan Balasescu
754f3216ab
Merge pull request #1928 from peppy/stop-direct-previews
Stop any playing preview when closing the direct overlay
2018-01-18 18:25:30 +09:00
smoogipoo
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
Dean Herbert
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
smoogipoo
89f4bfa7b5 Track mania scroll speed 2018-01-18 17:00:41 +09:00
smoogipoo
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
smoogipoo
c2c478750d Remove generics from OSD registration methods 2018-01-18 16:57:32 +09:00