3717 Commits

Author	SHA1	Message	Date
Dean Herbert	acbcca4462	Merge branch 'master' into multi-background-stack	2019-03-20 19:11:27 +09:00
Dean Herbert	6f1610be79	Merge branch 'master' into ruleset-container-refactor	2019-03-20 14:55:58 +09:00
Dean Herbert	5f288650bf	Fix misses/typos	2019-03-20 14:49:33 +09:00
Dean Herbert	7b65d3437f	Merge branch 'master' into fix-background-loading	2019-03-20 10:33:53 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	68f28326a2	Refactor RulesetContainer for readability	2019-03-19 20:21:31 +09:00
Dean Herbert	e36ad3eb6b	Add initial alpha in case	2019-03-19 16:11:22 +09:00
Dean Herbert	d2007cfb38	Fix weird transition	2019-03-19 16:10:28 +09:00
Dean Herbert	83f3d3abde	Merge remote-tracking branch 'upstream/master' into disclaimer-support-text	2019-03-19 16:02:34 +09:00
Dean Herbert	14df9f94e2	Merge branch 'master' into fix-background-loading	2019-03-18 14:59:35 +09:00
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dan Balasescu	e0b3149e32	Merge branch 'master' into api-testability	2019-03-18 10:59:06 +09:00
Dean Herbert	300cb70859	Merge branch 'master' into multi-background-stack	2019-03-18 09:54:27 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	36e5c09710	Merge pull request #4433 from nekodex/prevent-null-lookup ... Don't perform lookup of beatmap stats unless an online id is present	2019-03-15 10:39:39 +09:00
Jamie Taylor	69eb4ef983	Change updateMetrics parameter to be optional	2019-03-14 13:35:49 +09:00
Dean Herbert	0042cc5337	Merge branch 'master' into mod-ramp-hotfix	2019-03-14 13:02:29 +09:00
Dean Herbert	dd6fbccb56	Slight refactoring of order for readability	2019-03-13 19:57:45 +09:00
Jamie Taylor	7a2af5634c	Merge remote-tracking branch 'upstream/master' into prevent-null-lookup	2019-03-13 14:13:50 +09:00
Jamie Taylor	e6449db8e3	Null metrics on null beatmap for transition animation	2019-03-13 14:13:42 +09:00
Dean Herbert	b1f18481e0	Show text to supporters telling them they're cool ... Also adds better tests for disclaimer screen.	2019-03-13 12:58:42 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
Dean Herbert	c1a356161f	Allow use rate adjust to fallback to clock rate adjust	2019-03-12 18:14:01 +09:00
David Zhao	e6a55cd674	Fix TestCaseEditor as well	2019-03-12 17:45:16 +09:00
Dean Herbert	3c2d8cad0a	Add better async logic for ScreenWithBeatmapBackground	2019-03-12 17:32:40 +09:00
Dean Herbert	8230d5b52e	Ensure initial blur is set on song select background creation ... We do not want the blur transition to play here	2019-03-12 17:27:20 +09:00
Dean Herbert	ee7169a629	Use new non-immediate suspend logic in BackgroundScreenStack	2019-03-12 17:26:16 +09:00
David Zhao	e3567a5507	Make OsuGame use OsuScreenStack too	2019-03-12 16:03:25 +09:00
Dean Herbert	00feb34a3d	Perform load even if default beatmap	2019-03-12 14:02:49 +09:00
Dean Herbert	1954eaca4c	Populate an initial beatmap	2019-03-12 14:01:27 +09:00
Dean Herbert	cc41618760	Reorganise class	2019-03-12 12:56:01 +09:00
Dean Herbert	5ba8388e54	Add load check to avoid double-loading	2019-03-12 12:55:54 +09:00
Dean Herbert	cdeaa80fea	Call ResetSpeedAdjustments before adjusting clock	2019-03-12 11:35:25 +09:00
Dean Herbert	13b3036ec6	Fix "wind" mods adjusting rate twice ... This is a hotfix for incorrect framework behaviour. Closes #4442	2019-03-12 02:45:45 +09:00
Dean Herbert	1be4c7b813	Fix excess newline	2019-03-12 02:23:23 +09:00
Dean Herbert	38e75421ab	Fix HoldForMenuButton getting stuck in a confirming state ... Closes #4446.	2019-03-12 02:21:34 +09:00
Dean Herbert	e9ab329e93	Fix backgrounds not correctly handling initial async load	2019-03-12 00:05:05 +09:00
Dean Herbert	81d9e391f4	Preload main menu background	2019-03-12 00:04:19 +09:00
David Zhao	63b9fa58ef	Cleanup	2019-03-11 19:52:28 +09:00
David Zhao	6a1e600099	Create new OsuScreenStack for use in Multiplayer	2019-03-11 19:48:07 +09:00
David Zhao	aeae6143c1	Remove unnecessary variable	2019-03-11 17:47:03 +09:00
David Zhao	0b64af5e02	Put multiplayer background inside a parallax container	2019-03-11 16:51:43 +09:00
David Zhao	0d95511222	Merge branch 'master' into multi-background-stack	2019-03-11 11:19:08 +09:00
David Zhao	2df57c3a29	Give Multiplayer its own background stack	2019-03-11 11:08:04 +09:00
Joehu	0fc6fa7245	Fix file naming on ParticipantCountDisplay	2019-03-09 20:29:56 -08:00
Dean Herbert	9df27f3a5f	Merge branch 'master' into prevent-null-lookup	2019-03-09 11:14:54 +09:00
Jamie Taylor	8e5816805c	Fix showing outdated data for non-online beatmaps	2019-03-08 18:44:35 +09:00
smoogipoo	d055b248ac	Remove blank line	2019-03-08 15:56:36 +09:00
smoogipoo	7c5ca67691	Merge remote-tracking branch 'origin/master' into gameplay-clock-container ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-03-08 15:54:15 +09:00
Dean Herbert	ed8c9bc88a	Merge remote-tracking branch 'upstream/master' into gameplay-clock-container	2019-03-08 15:07:55 +09:00