Commit Graph

7951 Commits

Author SHA1 Message Date
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
64d7868c03 Update APi.Username in APIAccess intead of ignoring it. 2018-01-22 01:19:22 -05:00
794ae5380a Intverted conditionals. 2018-01-22 01:06:27 -05:00
87ec36060d Save the obtained username when online. 2018-01-22 00:50:31 -05:00
c4252ee022 Use obtained value for displayed name. 2018-01-22 00:50:31 -05: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
35e7399bef Merge branch 'master' of https://github.com/ppy/osu into restart-crashfix 2018-01-21 23:56:16 -05: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
9ac035f3d5 Merge branch 'bdl-cache-changes' into ruleset-configs 2018-01-22 13:11:45 +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
530e0afa2c Use IsCurrentScreen instead of a bool for both checks now. 2018-01-21 22:27:15 -05:00
964c6da9a4 Use IsCurrentScreen instead of a bool 2018-01-21 22:00:18 -05:00
806da21760 Removed rreduntant initialization. 2018-01-21 20:24:19 -05:00
ad2df8d8df Fixed tilde-key crash at end of beatmap. 2018-01-21 20:09:44 -05:00
e88f514cf4 Resolve merge conflicts 2018-01-21 18:32:21 +03:00
4875443e12 Resolve merge conflicts 2018-01-21 18:11:43 +03:00
c4feb67bce Using field properties to set mute / unmute instead of separate methods 2018-01-20 11:45:04 +01: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
4a85266fca Using BindableBool to mute the volume when it's value changes 2018-01-18 17:23:02 +01: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
a94ea7025e Register/Unregister -> BeginTracking/StopTracking and add exceptions 2018-01-18 18:45:48 +09:00
dee298c395 No more statics + better unregistration 2018-01-18 17:40:05 +09:00
7ceed8b5eb Stop any playing preview when closing the direct overlay
Resolves #1925
2018-01-18 17:28:56 +09:00
7910b47868 Move ConfigManager registration/dependency injection to RulesetContainer 2018-01-18 17:00:23 +09:00
c2c478750d Remove generics from OSD registration methods 2018-01-18 16:57:32 +09:00
09dfea7e29 Use tracked settings from ConfigManager changes 2018-01-18 15:26:03 +09:00
9c09b33e4e Removed no longer used "lastVolume" field 2018-01-17 23:17:59 +01:00
18ff57fdf9 Inline changing mute icon properties with object creation 2018-01-17 21:09:46 +01:00
8471a579e0 Removed no longer neccessary "exiting" flag 2018-01-17 20:56:44 +01:00
a8fb732256 Added muted/unmuted icon 2018-01-17 20:43:08 +01: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