16578 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Zhao	25e7dcb375	Remove unused includes	2019-02-20 17:39:35 +09:00
David Zhao	d703a9511a	Fix background dim previews	2019-02-20 17:20:45 +09:00
David Zhao	3f000dfe2e	Remove unnecessary region	2019-02-20 16:58:12 +09:00
David Zhao	5bf405f949	Fix bindable name in tests	2019-02-20 16:56:57 +09:00
David Zhao	1bd1b6b099	Move user dim logic into UserDimContainer instead	2019-02-20 16:53:57 +09:00
David Zhao	87717dcf9e	Remove redundant constructors	2019-02-19 19:57:55 +09:00
David Zhao	2e375a9186	Add test cases for upwards traversal of screen stack	2019-02-19 19:44:26 +09:00
David Zhao	af049004dd	Add test cases for transitioning into pause overlay and into results	2019-02-18 19:53:55 +09:00
David Zhao	b353b69587	Use a bindable for updating dim status instead	2019-02-18 18:58:34 +09:00
David Zhao	4e07aba548	Make it so visual tests only load the osu ruleset	2019-02-18 18:12:45 +09:00
David Zhao	1d80674fbd	Fix fadecontainer being added to multiple containers	2019-02-18 17:11:38 +09:00
David Zhao	af30aefe77	Merge branch 'master' into UserDimLogic	2019-02-18 16:56:16 +09:00
Dean Herbert	a5a1d9d1cc	Merge pull request #4187 from LeNitrous/mod-grow ... Add "Grow" mod	2019-02-18 16:54:53 +09:00
Dan Balasescu	b1bdab8c36	Merge branch 'master' into mod-grow	2019-02-18 16:47:16 +09:00
David Zhao	80800f2931	Match up fade behavior with current master	2019-02-18 16:34:11 +09:00
David Zhao	9be25c3758	Fix unit tests	2019-02-18 16:00:59 +09:00
David Zhao	79b12ef085	Fix test build failure	2019-02-18 15:29:39 +09:00
David Zhao	f241d67e5f	Use conditional operator isntead of if	2019-02-18 15:23:03 +09:00
David Zhao	df148f8787	Fix background dim not being disabled on playerloader exit	2019-02-18 12:55:42 +09:00
Dean Herbert	0a265c6d35	Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-18 11:54:25 +09:00
Dean Herbert	66a5abe9bb	Merge pull request #4266 from miterosan/CakeBuildImprovements ... Improve the build script (and move to a better location)	2019-02-18 10:12:14 +09:00
Dean Herbert	d0c603e8e4	Merge branch 'master' into CakeBuildImprovements	2019-02-18 01:38:55 +09:00
miterosan	107e9550bc	Merge branch 'CakeBuildImprovements' of https://github.com/miterosan/osu into CakeBuildImprovements	2019-02-17 13:57:47 +01:00
miterosan	9708634232	Correct the path to the cakebuild.csproj.	2019-02-17 13:57:14 +01:00
Dean Herbert	8ab39efe3e	Merge pull request #4256 from smoogipoo/diffcalc-testcases ... Add difficulty calculator tests	2019-02-17 21:26:25 +09:00
Dean Herbert	42dc7644f2	Merge branch 'master' into diffcalc-testcases	2019-02-17 21:06:42 +09:00
miterosan	b61f929087	Merge branch 'master' into CakeBuildImprovements	2019-02-16 15:15:27 +01:00
miterosan	c09346080f	Remove the unused desktop project variable	2019-02-16 14:51:20 +01:00
Dean Herbert	bab29b94a6	Fix nullref when entering multiplayer (#4268) ... Fix nullref when entering multiplayer	2019-02-16 11:25:26 +09:00
smoogipoo	134840f118	Fix nullref	2019-02-16 11:18:17 +09:00
miterosan	ed67b580fa	Also apply the changes to build.sh	2019-02-16 00:02:08 +01:00
miterosan	57fcdf9a0b	Improve the buildscript	2019-02-15 23:47:22 +01:00
Dean Herbert	3372a0e5a2	Merge pull request #4265 from peppy/fix-screen-tests ... Fix screen tests	2019-02-15 22:26:22 +09:00
Dean Herbert	aceb8c4cb0	Fix TestCasePlaySongSelect	2019-02-15 21:50:40 +09:00
Dean Herbert	4777fd1334	Merge remote-tracking branch 'upstream/master' into fix-screen-tests	2019-02-15 21:29:44 +09:00
Dean Herbert	c607b8c979	Update framework	2019-02-15 21:28:59 +09:00
Dean Herbert	bd4e8e132b	Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support ... Add support for the HitCircleOverlap property of legacy skins	2019-02-15 21:27:56 +09:00
Dean Herbert	dfb4e82125	Merge pull request #4259 from nekodex/fix-cursor-on-startup ... Fix mouse cursor appearing prematurely during startup	2019-02-15 21:27:37 +09:00
Dean Herbert	90e462309f	Add newline	2019-02-15 21:16:54 +09:00
Dean Herbert	89981c02a2	Merge branch 'master' into fix-cursor-on-startup	2019-02-15 21:15:23 +09:00
Jamie Taylor	1c8212d510	Add a TestCase for looong combos	2019-02-15 21:03:55 +09:00
Jamie Taylor	38cf5a1ea4	Add support for the HitCircleOverlap property in legacy skins	2019-02-15 21:03:06 +09:00
Dan Balasescu	e9709e82b8	Merge pull request #4258 from peppy/fix-account-creation-regression ... Fix account creation overlay not working	2019-02-15 19:08:21 +09:00
Dean Herbert	fc583590d3	Fix OsuGame testcase	2019-02-15 17:40:49 +09:00
David Zhao	df7acc1d31	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-15 17:22:04 +09:00
David Zhao	fcc3cf3b7e	Remove extra comma	2019-02-15 17:21:47 +09:00
David Zhao	8693d6a76b	Merge branch 'master' into UserDimLogic	2019-02-15 17:11:21 +09:00
Dean Herbert	5d502250d8	Fix account creation overlay not working ... Regressed with screen stack changes.	2019-02-15 17:01:51 +09:00
Dean Herbert	65721a01ab	Fix regressed screen test cases	2019-02-15 17:01:06 +09:00
David Zhao	53b7fdd834	Clean up test code and unused includes	2019-02-15 16:57:53 +09:00