14256 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	d28acaada1	Merge branch 'master' into mania-conversion-safety	2018-08-16 10:37:07 +09:00
Dan Balasescu	34767e6722	Merge pull request #3234 from peppy/fix-info-wedge-test ... Fix info wedge test case failing randomly	2018-08-16 10:23:44 +09:00
Dean Herbert	ed2a642666	Fix info wedge test case failing randomly	2018-08-16 10:05:34 +09:00
Dean Herbert	6223696119	Merge pull request #3167 from jorolf/framework-storage-update ... Update storage usage in line with framework changes	2018-08-16 08:40:19 +09:00
smoogipoo	85dc42d47a	Re-namespace/rename CircularButton	2018-08-15 16:49:53 +09:00
smoogipoo	fe99aab0f2	Remove highly unnecessary testcase	2018-08-15 16:45:33 +09:00
smoogipoo	add78508e0	Update framework	2018-08-15 15:54:26 +09:00
smoogipoo	767c284793	Fix import not working	2018-08-15 15:49:55 +09:00
smoogipoo	4dfb63023f	Update with recent changes	2018-08-15 15:49:48 +09:00
smoogipoo	d0c9e2257b	Merge remote-tracking branch 'origin/master' into framework-storage-update	2018-08-15 14:54:09 +09:00
smoogipoo	05b5144dac	Add parsing test	2018-08-15 13:36:22 +09:00
Dean Herbert	e9180a0be8	Merge pull request #3223 from smoogipoo/fix-strong-swells ... Fix swells possibly being strong hitobjects	2018-08-15 13:25:34 +09:00
smoogipoo	539dd3134f	Fix beatmap processor not setting combo index on first object	2018-08-15 11:48:50 +09:00
smoogipoo	4c3e551295	Fix first object not receiving new combo ... Note: If a normal catch fruit is the first object, it does not receive a new combo...	2018-08-15 11:48:28 +09:00
smoogipoo	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	da3e2cfee2	Catch/osu! spinners should have combo	2018-08-15 11:13:23 +09:00
smoogipoo	4f0305ffeb	Taiko convert hitobjects should not have combo	2018-08-15 10:58:59 +09:00
smoogipoo	83f75ac896	Mania convert hitobjects should not have combo	2018-08-15 10:57:11 +09:00
smoogipoo	8faf12579a	Fix field not being set correctly	2018-08-15 10:53:25 +09:00
smoogipoo	d2709613bc	Add combo offset to ConvertHitObjectParser	2018-08-15 10:49:45 +09:00
smoogipoo	ce77473910	Simplify usage of ConvertHitObjectParser	2018-08-15 10:24:56 +09:00
smoogipoo	26d4bb5451	xmldoc + reword	2018-08-15 09:51:02 +09:00
Dean Herbert	4832a8ff19	Merge pull request #3220 from smoogipoo/extend-modoverlay ... Overflow mod select to account for parallax	2018-08-15 09:37:57 +09:00
Dean Herbert	9cdaefb64b	Merge branch 'master' into extend-modoverlay	2018-08-15 09:23:44 +09:00
smoogipoo	aa3f6337a2	Add comment	2018-08-15 09:14:07 +09:00
smoogipoo	7c3556baf8	Throw exception when Swell.IsStrong is set	2018-08-15 09:12:29 +09:00
Dean Herbert	7bb22ce2b9	Merge pull request #3222 from smoogipoo/fix-rewinding ... Fix hitobject results not rewinding	2018-08-15 09:07:31 +09:00
Dean Herbert	607769c9ce	Merge branch 'master' into fix-rewinding	2018-08-15 08:45:34 +09:00
Dean Herbert	a1fa235600	Merge branch 'master' into fix-strong-swells	2018-08-15 00:23:51 +09:00
Dean Herbert	c2fe0241e3	Merge pull request #3221 from smoogipoo/fix-variables-parsing ... Fix storyboard variables not supporting prefixes/suffixes	2018-08-14 21:41:53 +09:00
smoogipoo	8be5a606bf	Fix swells possibly being strong hitobjects	2018-08-14 18:33:07 +09:00
smoogipoo	e04b2f4fa9	Fix hitobject results not rewinding	2018-08-14 18:31:32 +09:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	f69bc23ab8	Overflow mod select to account for parallax	2018-08-14 17:26:25 +09:00
smoogipoo	2019a89a08	Softly-handle infinite loops in mania beatmap conversion	2018-08-14 16:45:35 +09:00
Dean Herbert	364c0d580a	Merge pull request #3218 from smoogipoo/fix-ruleset-change ... Fix crash due to mods not being reset prior to ruleset changing	2018-08-14 14:56:53 +09:00
Dean Herbert	5112f9b69f	Merge branch 'master' into fix-ruleset-change	2018-08-14 14:48:09 +09:00
Dean Herbert	adaffc245f	Merge pull request #3166 from smoogipoo/judgement-rework ... Rework judgements and judgement results	2018-08-14 14:44:13 +09:00
smoogipoo	b045f5c9b6	Adjust filename	2018-08-14 14:32:06 +09:00
smoogipoo	1a35506386	Cleanup strong hit construction	2018-08-14 14:29:49 +09:00
smoogipoo	732dfde8ed	DrawableStrongHandler -> DrawableNestedStrongHit	2018-08-14 14:28:40 +09:00
smoogipoo	7971d06df1	Remove AlwaysPresent	2018-08-14 14:27:47 +09:00
smoogipoo	78258e2fe2	Prefix some methods with "Test"	2018-08-14 14:19:26 +09:00
smoogipoo	15bd7e4f1f	Test that changing ruleset resets mods	2018-08-14 14:18:46 +09:00
smoogipoo	970aa811bd	Fix mods not being reset prior to ruleset changing	2018-08-14 13:19:50 +09:00
Dean Herbert	270dc2d1be	Merge branch 'master' into judgement-rework	2018-08-14 13:16:16 +09:00
Dean Herbert	da01501a1c	Merge pull request #3217 from smoogipoo/fix-samples ... Fix new control points with same start time not replacing existing ones	2018-08-14 11:55:23 +09:00
smoogipoo	b8824a41b5	Fix certain control points not being replaced	2018-08-14 11:44:53 +09:00
Dan Balasescu	48b0b1593f	Merge pull request #3179 from peppy/direct-list-view ... Reduce animations of osu!direct list mode	2018-08-08 15:57:03 +09:00
smoogipoo	2a5b9f79ff	Indent	2018-08-08 15:49:27 +09:00