Commit Graph

6563 Commits

Author SHA1 Message Date
b77f08941c Make mania play the next note's sounds if no note is hit
Fixes #1911.

This follows what osu!stable does, which is rather unfortunate, since it just plays _every_ sound for the note :|.
2018-01-24 20:05:37 +09:00
8d11596b2f Minor cleanups 2018-01-24 17:48:42 +09:00
7f299b2533 Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization 2018-01-24 17:44:28 +09:00
fa800f0977 fix storyboard path 2018-01-23 18:18:54 +08:00
384dc162b3 Merge branch 'master' into fix-repeat-confusion 2018-01-23 16:06:07 +09:00
52805cd82b Merge branch 'master' into fix-repeat-confusion 2018-01-23 15:22:37 +09:00
fcea12f83d Merge branch 'master' into allow-quick-retry-key 2018-01-23 14:59:15 +09:00
b793c2ec93 Merge branch 'master' into bdl-cache-changes 2018-01-23 14:10:35 +09:00
d37844c068 Clean up off-by-one offsets from repeat-related properties 2018-01-23 13:37:25 +09:00
fa1f4304f6 Remove usings 2018-01-23 13:24:04 +09:00
f823650b10 Allow user choice of the quick retry hotkey 2018-01-23 13:05:07 +09:00
b799dac5ac Merge branch 'master' into mania_stage_fix 2018-01-23 10:55:33 +09:00
d294fcfb0b Merge branch 'master' of https://github.com/ppy/osu into license-year (AppVeyor?) 2018-01-22 18:42:03 +01:00
423559ec6c Update license year. 2018-01-22 18:22:38 +01:00
76eac9057d Merge branch 'master' into mania_stage_fix 2018-01-22 19:06:00 +09:00
95f941163b Merge branch 'master' into direct-show-deleted-sets 2018-01-22 17:08:10 +09:00
73799832ef Merge branch 'master' into direct-show-deleted-sets 2018-01-22 16:54:32 +09:00
a931d6e381 Merge branch 'master' into fix-user-download-cancel 2018-01-22 16:27:26 +09:00
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
c1331cef1b Disallow DualStages for non-converted beatmaps 2018-01-22 15:52:54 +09:00
56c001fd29 Merge branch 'master' into fix-downloads-during-import 2018-01-22 15:43:39 +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
3d4e2d400c Remove unused using 2018-01-22 13:52:10 +09:00
53e40a77dc Don't show error messages when a download is user-cancelled
Resolves #1941.
2018-01-22 13:25:49 +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
b4e1872322 osu!-side changes in-line with framework BDL cache changes 2018-01-22 12:56:30 +09:00
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
596044e19d show beatmapsets with pending deletion in osu!direct 2018-01-19 17:25:32 +01:00
feb79ff9e7 Merge branch 'master' into mania_stage_fix 2018-01-19 20:08:24 +08:00
652f273961 Ensure previews stop playing when they are removed from the draw hierarchy 2018-01-19 15:46:42 +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
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
6c67f96fdb fix ci error 2018-01-18 02:01:01 +09:00
864d106635 Merge branch 'master' into fix-replays 2018-01-18 00:49:02 +09:00
a05032779f Remove unneeded event binding 2018-01-18 00:04:33 +09:00
3b291abf60 Merge branch 'master' of https://github.com/ppy/osu into mania_stage_fix
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game/Rulesets/UI/Playfield.cs
2018-01-17 22:27:32 +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
2ebb3d6e0e Fix ReplayLoader not being treated as having a replay loaded
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
52b48f2b7e Fix replays not correctly considering negative time diffs 2018-01-17 15:23:07 +09:00