Dean Herbert 6bc0afdafb Fix remaining conflicts		2020-10-05 20:09:18 +09:00
..
Timeline	Fix remaining conflicts	2020-10-05 20:09:18 +09:00
BeatDivisorControl.cs	Update osu.Game/Screens/Edit/Compose/Components/BeatDivisorControl.cs	2020-03-18 00:04:03 +02:00
BlueprintContainer.cs	Trigger a hitobject update after blueprint drag ends	2020-09-28 15:37:06 +09:00
CircularDistanceSnapGrid.cs	Fix distance snap grid showing incorrect colouring	2020-01-28 11:59:21 +09:00
ComposeBlueprintContainer.cs	Fix new placement hitobjects in the editor not getting the default sample added	2020-09-28 15:36:13 +09:00
ComposeSelectionBox.cs	Add missing xmldoc	2020-10-01 13:47:49 +09:00
DistanceSnapGrid.cs	Change snapping to be screen space coordinate based	2020-05-20 21:00:29 +09:00
DragBox.cs	Add basic selection box with drag handles	2020-09-29 20:08:56 +09:00
EditorPlayfieldBorder.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
MoveSelectionEvent.cs	Remove unused ScreenSpaceStartPosition field	2020-01-23 14:30:25 +09:00
SelectionHandler.cs	Fix header casing	2020-09-30 15:35:25 +09:00