Commit Graph

10045 Commits

Author SHA1 Message Date
56c001fd29 Merge branch 'master' into fix-downloads-during-import 2018-01-22 15:43:39 +09:00
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
d81fb9ef0d Merge branch 'master' into better-direct-progress-bar 2018-01-22 15:03:34 +09:00
723f31815a Merge pull request #1949 from smoogipoo/disable-waveform-testcase
Disable TestCaseWaveform
2018-01-22 15:03:23 +09:00
86769a521c Merge branch 'master' into disable-waveform-testcase 2018-01-22 14:25:53 +09:00
152475858b Merge branch 'master' into fix-downloads-during-import 2018-01-22 14:25:24 +09:00
20be4bbbcd Merge branch 'master' into better-direct-progress-bar 2018-01-22 14:25:23 +09:00
2e2fc4be57 Merge pull request #1938 from Shawdooow/overall-difficulty
Overall difficulty
2018-01-22 14:25:19 +09:00
410cd0c7fb Merge branch 'master' into disable-waveform-testcase 2018-01-22 13:53:59 +09:00
81635c8310 Merge branch 'master' into overall-difficulty 2018-01-22 13:50:37 +09:00
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
4780c3f8c6 Disable TestCaseWaveform 2018-01-22 13:41:47 +09:00
9405f349fc Update framework 2018-01-22 13:21:35 +09:00
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
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
29466438a3 fix values 2018-01-19 20:58:43 -05:00
c29eea870d correct values 2018-01-19 20:56:41 -05:00
e109d5fe20 fix slider heads 2018-01-19 11:13:49 -05:00
4d1142a0ce overall difficulty 2018-01-19 11:11:28 -05:00
f0dbf2e18c Merge remote-tracking branch 'refs/remotes/ppy/master' 2018-01-19 11:04:17 -05:00
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +09:00
64c32f5715 Merge pull request #1926 from Aergwyn/preview-fixes
Minor preview fixes
2018-01-19 00:12:41 +09:00
250e936099 Merge branch 'master' into preview-fixes 2018-01-19 00:03:47 +09:00
56619ae926 use ternary expression 2018-01-18 15:53:53 +01:00
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
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
46ba2cda10 Remove unused using 2018-01-18 21:19:06 +09:00
1a83770a06 Fix incorrect math 2018-01-18 21:16:15 +09:00
065d2a4887 Add licence header 2018-01-18 21:12:53 +09:00
01ff1584c2 Fix repeat points not following slider snaking correctly 2018-01-18 21:06:47 +09:00
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
e2965e1682 Remove unused using 2018-01-18 20:46:57 +09:00
063767e381 Prioritise hit normal
It's always first but not strictly guaranteed anywhere yet.
2018-01-18 20:37:46 +09:00
97884e1d05 Remove unnecessary null checks 2018-01-18 19:57:49 +09:00
b4f2bea37b Fix slider samples playing twice when additions are present 2018-01-18 19:50:26 +09:00
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
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
65bac6d31a return preview instead of nothing if it exists already
allows listening to it again after reaching the end
2018-01-17 20:36:47 +01:00
f86cb30e47 prevent negative width on progress bar 2018-01-17 20:35:28 +01:00
95a1556376 Merge pull request #1923 from smoogipoo/fix-replays
A lot of fixes to replay playback
2018-01-18 01:36:58 +09:00
864d106635 Merge branch 'master' into fix-replays 2018-01-18 00:49:02 +09:00
afb55b5c43 Merge pull request #1924 from peppy/mute-global-track-when-preview
Mute global track volume when a beatmap preview is playing
2018-01-18 00:48:46 +09:00
a05032779f Remove unneeded event binding 2018-01-18 00:04:33 +09:00
c79603290d Move TriggerChange to LoadComplete() 2018-01-17 21:52:57 +09:00
e7524445ee Use Restart() 2018-01-17 21:33:19 +09:00
54ed608ddb Mute global track volume when a beatmap preview is playing 2018-01-17 21:26:12 +09:00
379688e2f2 Add todo 2018-01-17 20:15:17 +09:00
da22b3ec49 No more sorting 2018-01-17 20:12:39 +09:00
be225eff90 Merge branch 'master' into fix-replays 2018-01-17 18:01:41 +09:00
a01e46bb68 Fix ScoreStore replays not getting users 2018-01-17 17:55:55 +09:00