16735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
smoogipoo	20f91106d9	Fix failing test	2019-02-18 15:02:46 +09:00
smoogipoo	ddc1ad848e	Fix failing test	2019-02-18 15:02:09 +09:00
smoogipoo	b47ced8c58	Fix failing test	2019-02-18 15:01:14 +09:00
smoogipoo	9cce9ce97c	Consider aggregate peaks	2019-02-18 15:00:32 +09:00
smoogipoo	68725dc005	Implement new difficulty calculator for Rulesets.Mania	2019-02-18 15:00:20 +09:00
smoogipoo	659ec267b6	Fix spinners increasing strain	2019-02-18 14:58:33 +09:00
smoogipoo	c930cc5fb5	Fix incorrect OsuDifficultyHitObject instantiation	2019-02-18 14:58:13 +09:00
smoogipoo	fd70269021	Implement new difficulty calculator for Rulesets.Osu	2019-02-18 14:58:03 +09:00
smoogipoo	7f4643a83d	Adjust naming	2019-02-18 14:55:39 +09:00
smoogipoo	46b979a412	Fix colour changes not being reset	2019-02-18 14:55:20 +09:00
smoogipoo	cb17cbcdc4	Fix taiko nullrefing	2019-02-18 14:54:35 +09:00
smoogipoo	25d85b6eb4	Implement new difficulty calculator for Rulesets.Taiko	2019-02-18 14:54:21 +09:00
smoogipoo	9463475202	Remove now unused member	2019-02-18 14:51:43 +09:00
smoogipoo	83cab2ba8a	Fix incorrect hitobject being used as the last hitobject	2019-02-18 14:50:47 +09:00
smoogipoo	f6b13ca79d	Rewrite catch diffcalc for readability + attempt to fix	2019-02-18 14:50:47 +09:00
smoogipoo	e02ae927b3	Fix nullrefs	2019-02-18 14:50:47 +09:00
smoogipoo	8eba94e8c9	Implement new difficulty calculator for Rulesets.Catch	2019-02-18 14:50:47 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +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