16856 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	8104c45c25	Merge remote-tracking branch 'origin/master' into new-diffcalc-mania ... # Conflicts: # osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs	2019-02-19 16:30:05 +09:00
Dean Herbert	9a60f3b0de	Merge branch 'master' into new-diffcalc-osu	2019-02-19 15:56:12 +09:00
Dean Herbert	b9c9c9ea21	Merge pull request #4277 from smoogipoo/diffcalc-merging-2 ... Implement new difficulty calculator structure	2019-02-19 15:55:29 +09:00
Dean Herbert	0609fcf7d4	Fix TestCaseMultiScreen intermittent failures	2019-02-19 15:52:53 +09:00
Dean Herbert	151388dfad	Merge branch 'master' into diffcalc-merging-2	2019-02-19 15:42:15 +09:00
smoogipoo	ade5763160	Fix post-merge errors	2019-02-19 14:34:02 +09:00
smoogipoo	0001b6204b	Merge branch 'diffcalc-merging-2' into new-diffcalc-osu ... # Conflicts: # osu.Game.Rulesets.Osu/Difficulty/OsuLegacyDifficultyCalculator.cs	2019-02-19 14:33:34 +09:00
smoogipoo	7ed461aa8c	XMLDoc DifficultyHitObject	2019-02-19 14:30:59 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
smoogipoo	9d8ba4073c	Add tests for LimitedCapacityStack	2019-02-19 14:18:49 +09:00
smoogipoo	3784b673ae	History -> LimitedCapacityStack + re-xmldoc	2019-02-19 13:51:19 +09:00
smoogipoo	af0bb4d5e8	Remove mods from constructor	2019-02-19 13:40:39 +09:00
Dean Herbert	87dd7bcf6b	Fix one more test regression	2019-02-19 13:02:33 +09:00
Dean Herbert	0fce23a36b	Fix test regression	2019-02-19 12:38:45 +09:00
Dean Herbert	62fe5ad481	Nest class	2019-02-19 12:35:52 +09:00
Dean Herbert	f8033a3b35	Give TestWorkingBeatmap a reference clock	2019-02-19 12:27:30 +09:00
Dan Balasescu	805805020d	Merge pull request #4289 from peppy/fix-ruleset-loading ... Fix test dlls being loaded as actual rulesets (and failing)	2019-02-19 12:25:11 +09:00
Dean Herbert	133c002d02	Fix test dlls being loaded as actual rulesets (and failing)	2019-02-19 12:13:55 +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
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +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
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
ThePyrotechnic	7bb56a198a	Merge branch 'master' into MissingSource	2019-02-17 19:54:43 +00: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