491 Commits

Author	SHA1	Message	Date
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
Dean Herbert	94449ed597	Merge branch 'master' into notification-verbosity	2017-12-26 20:48:59 +09: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
smoogipoo	66b19b6c97	Expose selected objects from SelectionLayer	2017-12-15 14:48:24 +09:00
smoogipoo	b28b86dea9	Use Lazy for threadsafety on playfield	2017-12-14 20:27:51 +09:00
smoogipoo	3d51301e03	Add license headers	2017-12-11 22:21:33 +09:00
smoogipoo	666dcdbd62	Give HitObjectComposer a SelectionLayer	2017-12-11 22:20:02 +09:00
smoogipoo	a303bf71cf	Give control over screen space conversion to DrawableHitObject	2017-12-11 22:19:02 +09:00
smoogipoo	2f1063c5c0	Refactor into separate files + add xmldocs + rename some methods	2017-12-11 21:56:58 +09:00
smoogipoo	c12c241633	Implement hover colours	2017-12-11 21:27:19 +09:00
smoogipoo	25d80a36be	Finish up logical implementation of markers	2017-12-11 21:03:34 +09:00
smoogipoo	5147b342dc	More refactorings + add markers ... Move	2017-12-11 19:07:40 +09:00
smoogipoo	b28306d3c0	Fix incorrect SelectionPoint	2017-12-11 18:08:16 +09:00
smoogipoo	4573cc3322	Refactor into a new DragBox class, representing a single drag	2017-12-11 17:45:03 +09:00
smoogipoo	7189446943	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-11 16:34:27 +09:00
Dean Herbert	77592ed15f	Fix comment formatting	2017-12-11 14:52:15 +09:00
Dean Herbert	d02e1ae896	Update RulesetInfo and add migration	2017-12-10 12:15:55 +09:00
Dean Herbert	679134c030	Add ShortName to rulesets	2017-12-08 18:55:25 +09:00
smoogipoo	5341e79102	Remove SelectionDragger for now	2017-12-08 17:51:15 +09:00
smoogipoo	faa921ba05	Fix up post-merge issues	2017-12-08 17:41:10 +09:00
FreezyLemon	9e3d439f0a	Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix	2017-12-08 08:30:02 +01:00
smoogipoo	f41af191ed	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-08 15:13:18 +09:00
FreezyLemon	43c270ea49	Rolled back the bad earlier implementation	2017-12-07 21:18:51 +01:00
Dean Herbert	c35c8263b9	Merge remote-tracking branch 'upstream/master' into input-revamp	2017-12-07 18:07:26 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
smoogipoo	e573db04d4	Don't serialize HitObject.Kiai	2017-12-07 14:42:36 +09:00
Dean Herbert	a78441bc5a	Apply changes in line with framework input adjustments	2017-12-07 13:16:59 +09:00
smoogipoo	41b607c165	Dont serialize hitobject sample properties copied from the control point	2017-12-07 03:40:43 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00
smoogipoo	a80059032c	Remove PlayfieldOverlay	2017-12-02 20:24:10 +09:00