17161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Zhao	882fff1631	Assert storyboard visibilty at both steps of toggle	2019-02-27 17:56:44 +09:00
Dean Herbert	99d8d39ea1	Merge branch 'master' into fix-crossthread	2019-02-27 17:46:12 +09:00
smoogipoo	1006c539be	Fix looping not being checked	2019-02-27 17:03:09 +09:00
David Zhao	14ffd9efe8	Add fake storyboard to visually assess storyboard dim	2019-02-27 17:02:04 +09:00
smoogipoo	30815ace62	Fix crossthread operations due to Track.Completed	2019-02-27 16:52:34 +09:00
Dan Balasescu	e5eab11a2a	Merge pull request #3851 from ekrctb/use-lifetime-optimization ... Do less work for dead drawables in gameplay	2019-02-27 16:46:47 +09:00
smoogipoo	c13a5184f3	Add more explanation	2019-02-27 16:35:11 +09:00
smoogipoo	f66fefb818	Adjust comment + accessibility	2019-02-27 16:30:10 +09:00
Jamie Taylor	c59d84fd21	Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods	2019-02-27 16:21:14 +09:00
Jamie Taylor	a3f71d69a9	Ensure ruleset and mods are set correctly when leaving MatchSongSelect	2019-02-27 16:16:13 +09:00
smoogipoo	32bf940aa5	Adjust comment for readability	2019-02-27 15:43:20 +09:00
Jamie Taylor	7c2ffb1826	Fix MatchSongSelect not handling beatmapset deletions	2019-02-27 14:34:39 +09:00
David Zhao	ebec944bb8	Use actual song select for test case with beatmap import	2019-02-27 14:15:45 +09:00
Joehu	5b4319a80f	Fix home button being cancelled by mod select again	2019-02-26 21:01:28 -08:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
Dean Herbert	109abf4d28	Merge pull request #4338 from jorolf/disable-auto-dectect ... Add flag to osu.iOS.sln.DotSettings as well	2019-02-27 05:35:07 +09:00
jorolf	26b74ad46a	Add flag to osu.iOS.sln.DotSettings	2019-02-26 16:24:23 +01:00
Dean Herbert	6f1a1432f5	Merge pull request #4337 from jorolf/disable-auto-dectect ... Disable auto detected rules	2019-02-27 00:13:13 +09:00
jorolf	2784df3b68	Disable auto detected rules	2019-02-26 15:36:07 +01:00
jorolf	4c10185f5b	Fade out text instead of removing it immediately	2019-02-26 15:26:00 +01:00
jorolf	cacef7421d	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-26 14:09:12 +01:00
Dean Herbert	bf6815b2a7	Fix OsuGame test case not working	2019-02-26 18:02:24 +09:00
David Zhao	59fca568c9	Remove null checks for synchronous loads	2019-02-26 17:56:42 +09:00
David Zhao	d23f399375	Add back song select wait	2019-02-26 17:43:42 +09:00
David Zhao	60ecb99dfb	Have test cases create a new screen stack each time	2019-02-26 17:31:21 +09:00
Dean Herbert	a11a7fa6f1	Merge pull request #4240 from ThePyrotechnic/MissingSource ... Improve layout of beatmap details pane when source is unknown	2019-02-26 16:20:23 +09:00
Dean Herbert	5b88c2ea0f	Add visual test	2019-02-26 16:12:40 +09:00
Dean Herbert	d9872dda12	Use fade instead of negative margin	2019-02-26 16:10:06 +09:00
Dean Herbert	2d6d9dd723	Add better easing	2019-02-26 16:09:45 +09:00
Dean Herbert	c1432b2ed5	Add back newline	2019-02-26 15:48:34 +09:00
Dean Herbert	2fc34496fd	Merge branch 'master' into MissingSource	2019-02-26 15:38:51 +09:00
Dean Herbert	19d62f76ba	Merge pull request #4329 from swoolcock/hide-exit-button ... Hide exit button if the host does not support exiting	2019-02-26 13:42:13 +09:00
Dean Herbert	d2dc38f298	Merge branch 'master' into hide-exit-button	2019-02-26 13:25:47 +09:00
Dean Herbert	3213a9a443	Merge pull request #4334 from smoogipoo/fix-negative-score ... Fix scores being stored as ints	2019-02-26 13:18:47 +09:00
smoogipoo	8a943a6e65	Fix scores being stored as ints	2019-02-26 13:10:59 +09:00
Dan Balasescu	32b8bb2ccc	Fix broken grammar ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-26 12:28:49 +09:00
Dean Herbert	3549369822	Restore previous wait time ... For whatever reason, this is required?	2019-02-26 10:27:54 +09:00
Dean Herbert	217f692798	Extract wait logic into separate method ... Also reduces the required wait time.	2019-02-26 10:11:36 +09:00
Dean Herbert	c58d305fc6	private goes after public	2019-02-26 09:56:22 +09:00
Shane Woolcock	e91c07209f	Move MainMenu initialisation from ctor to load	2019-02-26 09:54:42 +09:00
Dean Herbert	14e427fed7	Rename some methods (they weren't Asserting)	2019-02-26 09:54:28 +09:00
jorolf	796044ee7d	*I should've rechecked the code after the master merge*	2019-02-25 23:53:44 +01:00
jorolf	501dab7b32	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-25 23:49:01 +01:00
jorolf	c680d63694	Don't show the supporter text if the user already has supporter status	2019-02-25 23:44:43 +01:00
Dean Herbert	568e90c70b	Merge branch 'master' into UserDimLogic	2019-02-25 22:35:48 +09:00
David Zhao	a7585dea21	Make screen stack readonly	2019-02-25 22:17:51 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00
Shane Woolcock	bebb635ca1	Merge branch 'master' into hide-exit-button ... # Conflicts: # osu.Game/Screens/Menu/MainMenu.cs	2019-02-25 21:48:42 +09:00
Shane Woolcock	2bd5bb3f69	Move all MainMenu button creation into load	2019-02-25 21:41:41 +09:00