6797 Commits

Author	SHA1	Message	Date
Aergwyn	205d3ed896	fix settings not getting injected	2018-01-23 19:42:21 +01:00
Michael Manis	6dfd0b5cc2	Unnecessary because of prior commit.	2018-01-23 10:55:22 -05:00
Michael Manis	d12e18d59b	merged with master	2018-01-23 10:50:57 -05:00
james58899	fa800f0977	fix storyboard path	2018-01-23 18:18:54 +08:00
Dean Herbert	b197cd56af	Allow DI'd OnScreenDisplay to be null	2018-01-23 16:42:31 +09:00
Dean Herbert	c01f67b0d8	Merge remote-tracking branch 'upstream/master' into ruleset-configs	2018-01-23 16:23:25 +09:00
Dean Herbert	384dc162b3	Merge branch 'master' into fix-repeat-confusion	2018-01-23 16:06:07 +09:00
Dean Herbert	52805cd82b	Merge branch 'master' into fix-repeat-confusion	2018-01-23 15:22:37 +09:00
Dan Balasescu	fcea12f83d	Merge branch 'master' into allow-quick-retry-key	2018-01-23 14:59:15 +09:00
Dean Herbert	b793c2ec93	Merge branch 'master' into bdl-cache-changes	2018-01-23 14:10:35 +09:00
smoogipoo	d37844c068	Clean up off-by-one offsets from repeat-related properties	2018-01-23 13:37:25 +09:00
Dean Herbert	fa1f4304f6	Remove usings	2018-01-23 13:24:04 +09:00
Dean Herbert	f823650b10	Allow user choice of the quick retry hotkey	2018-01-23 13:05:07 +09:00
Dean Herbert	b799dac5ac	Merge branch 'master' into mania_stage_fix	2018-01-23 10:55:33 +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
Dean Herbert	76eac9057d	Merge branch 'master' into mania_stage_fix	2018-01-22 19:06:00 +09:00
Dean Herbert	95f941163b	Merge branch 'master' into direct-show-deleted-sets	2018-01-22 17:08:10 +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
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
smoogipoo	c1331cef1b	Disallow DualStages for non-converted beatmaps	2018-01-22 15:52:54 +09:00
Dean Herbert	56c001fd29	Merge branch 'master' into fix-downloads-during-import	2018-01-22 15:43:39 +09:00
Michael Manis	64d7868c03	Update APi.Username in APIAccess intead of ignoring it.	2018-01-22 01:19:22 -05:00
Michael Manis	794ae5380a	Intverted conditionals.	2018-01-22 01:06:27 -05:00
Michael Manis	87ec36060d	Save the obtained username when online.	2018-01-22 00:50:31 -05:00
Michael Manis	c4252ee022	Use obtained value for displayed name.	2018-01-22 00:50:31 -05: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
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	3d4e2d400c	Remove unused using	2018-01-22 13:52:10 +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
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
Aergwyn	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
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	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
smoogipoo	a94ea7025e	Register/Unregister -> BeginTracking/StopTracking and add exceptions	2018-01-18 18:45:48 +09:00