515 Commits

Author	SHA1	Message	Date
Dean Herbert	9d099feadc	Merge branch 'master' into fix-catcher-width	2018-01-10 10:04:10 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	01038bd9bb	Merge branch 'master' into mania-rc-cleanup	2018-01-05 10:18:15 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
Dean Herbert	c8ec27c4de	Remove redundant prefix	2018-01-04 16:31:41 +09:00
Dean Herbert	152b846cff	Fix incorrect scaling of hitobjects in catch	2018-01-04 16:29:53 +09:00
smoogipoo	6d253fd33c	Add a way to adjust the conversion process with mods	2018-01-03 19:06:20 +09:00
Dean Herbert	b8fa33459a	Merge branch 'master' into disable-unimplemented-mods	2018-01-03 13:39:29 +09:00
Felix Ang	3e6f0c198c	Remove tab	2018-01-02 18:02:04 +01:00
Felix Ang	dccc134efa	Don't allow auto to fail	2018-01-02 17:53:29 +01:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Dean Herbert	f419518887	Make comment xmldoc	2018-01-02 15:33:00 +09:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
Dean Herbert	d9a80dae5d	Male NoFail use an applicable interface	2017-12-31 04:10:29 +09:00
Dean Herbert	fea4e1ff68	Add a base interface for applicable mods	2017-12-31 04:09:51 +09:00
Aergwyn	138d78309f	add HitCount enum and replace string usage with enum	2017-12-30 18:07:30 +01:00
smoogipoo	714d93dd92	Merge remote-tracking branch 'origin/master'	2017-12-30 16:17:14 +09:00
Dean Herbert	a0966305d4	Remove unnecessary new event	2017-12-30 14:46:44 +09:00
Aergwyn	f547c7986d	created option to override values before UpdateState is called	2017-12-29 17:50:55 +01:00
Dean Herbert	27cb445c24	Always recrusively apply custom sequence to nested hitobjects	2017-12-29 17:48:05 +09:00
Aergwyn	dbcf87267d	Merge branch 'master' into standard-hd-support	2017-12-27 21:26:39 +01:00
Dean Herbert	18eb74d38c	Merge branch 'master' into sliderbouncers-fix	2017-12-28 00:13:04 +09:00
Dean Herbert	496b0fef01	Merge branch 'master' into proper-taiko-hitsounds	2017-12-27 20:40:16 +09:00
smoogipoo	b87e6c8b2a	Add a method to get ruleset by name	2017-12-27 17:33:34 +09:00
Aergwyn	4c2554595e	implement hidden (mostly) ... some things work and others don't, I dunno	2017-12-26 17:25:18 +01:00
Dean Herbert	94449ed597	Merge branch 'master' into notification-verbosity	2017-12-26 20:48:59 +09:00
smoogipoo	9690591593	Make taiko use namespaced hitsounds ... This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.	2017-12-26 19:55:56 +09:00
Aergwyn	f5d4ed2a22	add interface to adjust DrawableHitObjects	2017-12-26 11:49:42 +01:00
smoogipoo	14162b5d46	Make InputDrum handle all Normals/Claps, hitobjects all others	2017-12-26 14:18:23 +09:00
Dean Herbert	6f5f4f76e5	Use Logger.Error when exceptions are involved	2017-12-25 18:21:15 +09:00
smoogipoo	0fb620a8d3	Make HitObject.Samples non-nullable	2017-12-25 16:41:18 +09:00
smoogipoo	d288d8a51f	Remove SampleInfoList	2017-12-25 15:40:01 +09:00
smoogipoo	68d76d4380	Fix taiko strong hits not being handled	2017-12-23 20:58:09 +09:00
Dean Herbert	aeafa5645a	Make Samples null by default and prepopulate in mania	2017-12-23 18:06:46 +09:00
Dean Herbert	2db68df999	Simplify DrawableHitObject's sample load code	2017-12-23 17:20:14 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
Dean Herbert	ff0927e71b	Remove unnecessary newline	2017-12-23 16:23:33 +09:00
Dean Herbert	46865bbacd	Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix ... # Conflicts: # osu.Game/Audio/SampleInfo.cs	2017-12-23 14:50:35 +09:00
Dean Herbert	1fa9dac1bb	Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix	2017-12-23 14:20:16 +09:00
smoogipoo	6a29f6020a	Make HitObjects construct nested hit objects	2017-12-22 21:42:54 +09:00
smoogipoo	cb7e192aff	Determine SampleInfo defaults in DrawableHitObject	2017-12-21 16:02:33 +09:00
smoogipoo	c99ea32574	Merge branch 'master' into beatmap-serialization	2017-12-21 13:39:39 +09:00
Dean Herbert	051a3c4d47	Fix line endings	2017-12-18 21:51:00 +09:00
smoogipoo	fabf1bf60a	Make the captured objects not update for now ... Since this is not the intended functionality.	2017-12-18 19:31:03 +09:00
smoogipoo	5493493f82	FinishCapture -> FinishDrag from Handles	2017-12-18 19:24:41 +09:00
smoogipoo	09c51df2bd	Marker* -> Handle	2017-12-18 19:21:26 +09:00
smoogipoo	3999940538	DragSelector -> HitObjectSelectionBox	2017-12-18 19:17:26 +09:00
Dan Balasescu	812181190e	Update SelectionLayer.cs	2017-12-18 14:10:14 +09:00
Dan Balasescu	17c58678cf	Update SelectionInfo.cs	2017-12-18 13:59:46 +09:00
Ninjaprawn	71e59bc9e7	Removed the IgnoreTooltip property	2017-12-16 20:16:40 +11:00