833 Commits

Author	SHA1	Message	Date
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
Dean Herbert	7ffc597a8e	Fix one-frame issues	2018-11-29 14:55:20 +09:00
Dean Herbert	3d46ac7d35	Remove unnecessary high frequency input	2018-11-29 13:21:11 +09:00
smoogipoo	f9f300b215	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Dean Herbert	4cfeb1b9a1	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Dean Herbert	c944e8bb29	Merge branch 'master' into fix-deletion-crash	2018-11-26 14:20:02 +09:00
smoogipoo	56032a4522	Merge branch 'mania-selection-movement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs # osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs	2018-11-26 11:45:48 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
smoogipoo	dc8cd51e15	Implement mania note deletion	2018-11-20 17:26:00 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	d5b937f88f	Fix post-merge issue	2018-11-19 19:17:03 +09:00
Dan Balasescu	8cee4141e8	Merge branch 'master' into note-placement	2018-11-19 19:08:53 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	d5464702fa	Fix post-merge issue	2018-11-15 20:56:34 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09:00
smoogipoo	c963fc7cd2	Reduce chaining	2018-11-14 18:34:13 +09:00
smoogipoo	6d43baf4bf	Make show/hide only invoked once each	2018-11-13 13:12:11 +09:00
smoogipoo	fbc20d2d4d	Hide placement when cursor is not in the playfield	2018-11-13 12:52:04 +09:00
smoogipoo	3a1fee59fb	Implement note placement	2018-11-12 18:24:18 +09:00
Dean Herbert	4783df1d4b	Fix compose mode not working	2018-11-09 11:36:06 +09:00
smoogipoo	c6350c6efd	Remove IHasEditablePosition	2018-11-08 13:03:11 +09:00
smoogipoo	5d51719572	Make selection blueprints handle position adjustments	2018-11-07 16:21:32 +09:00
smoogipoo	52f4923c8e	Remove intermediate Screens namespace	2018-11-06 18:28:22 +09:00
smoogipoo	ac25718c5a	Renamespace compose-mode components	2018-11-06 18:14:46 +09:00
smoogipoo	27d82052f4	BorderLayer -> EditorPlayfieldBorder	2018-11-06 18:10:46 +09:00
smoogipoo	85f96ad62f	Fix a few missed renames	2018-11-06 18:07:53 +09:00
smoogipoo	bd775af274	PlacementMask -> PlacementBlueprint	2018-11-06 18:04:03 +09:00
smoogipoo	11be820efe	CreateMaskFor -> CreateBlueprintFor	2018-11-06 18:03:21 +09:00
smoogipoo	90c813618a	Merge PlacementContainer into BlueprintContainer	2018-11-06 18:02:55 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
smoogipoo	ad2836a61e	MaskSelection -> SelectionBox	2018-11-06 17:52:47 +09:00
smoogipoo	26c9390c16	HitObjectMaskLayer -> BlueprintContainer	2018-11-06 17:36:10 +09:00
Dean Herbert	85a7325911	Fix placement masks handling scroll events	2018-10-31 17:23:27 +09:00
Dean Herbert	3207a585c6	Add missing xmldoc	2018-10-31 12:01:10 +09:00
smoogipoo	2b141a2bc1	Make PlacementMask abstract	2018-10-25 19:10:59 +09:00
smoogipoo	ea6db8b793	Make the hitobject masks move within their placement/selection	2018-10-25 18:16:25 +09:00
smoogipoo	0e841628b6	Implement hitobject deletion	2018-10-18 16:36:06 +09:00
smoogipoo	5a5e91eaed	Add a way to re-invoke ApplyDefaults on placement object	2018-10-17 18:36:47 +09:00
smoogipoo	b7435c0c5f	Fix border layer not working	2018-10-17 18:29:30 +09:00
smoogipoo	6eb7a030d0	Fix placement container not being refreshed upon placement	2018-10-17 18:11:44 +09:00
smoogipoo	d36ac59ca2	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
smoogipoo	969477dadd	Remove placement events, make everything pass top-down	2018-10-17 17:43:16 +09:00
smoogipoo	62635c5ab8	Add container to handle placement mask	2018-10-17 16:17:49 +09:00
smoogipoo	4ea4ec0d25	Move placement handling events to a higher level	2018-10-17 15:46:30 +09:00
smoogipoo	08e3fe1def	Add PlacementStarted event, rename placement methods	2018-10-17 14:37:45 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
smoogipoo	b56d09c83b	Set hitobject placement time manually	2018-10-10 15:32:59 +09:00
smoogipoo	ff559a3a1b	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-10-05 10:40:16 +09:00
smoogipoo	e931aa3d9e	Move positional modifications to HitCirclePlacementMask	2018-10-04 13:43:50 +09:00
smoogipoo	7809ce9361	Fix 1-frame position discrepancy	2018-10-03 17:05:22 +09:00
smoogipoo	934b687965	Fix selection masks not being added for new objects	2018-10-03 16:49:59 +09:00
smoogipoo	34ed60830c	Keep the placement hitobject time up-to-date	2018-10-03 16:44:37 +09:00
smoogipoo	3420e0c7eb	Re-implement composition tools + implement placement masks	2018-10-03 16:27:26 +09:00
smoogipoo	540a010fbb	Implement an intermediary EditRulesetContainer	2018-10-03 15:36:24 +09:00
smoogipoo	4cdb6dcea5	Rename HitObjectMask -> SelectionMask	2018-10-03 13:28:00 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
smoogipoo	826dc6ceb7	Make Playfield not a ScalableContainer	2018-09-21 14:02:32 +09:00
Dean Herbert	aead4be134	Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container	2018-07-23 06:36:10 +02:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
smoogipoo	9b7d01397b	Add ruleset config to HitObjectComposer	2018-07-17 16:53:32 +09:00
smoogipoo	9f730dd784	Merge branch 'editor-composer-cleanup' into mania-mask-container ... # Conflicts: # osu.Game/Rulesets/Edit/HitObjectComposer.cs # osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs	2018-07-17 16:00:46 +09:00
smoogipoo	3905a9105c	Add a playfield method to retrieve all hitobjects	2018-07-17 15:51:10 +09:00
smoogipoo	0b66f63f7d	Invert flow order of hitobjects between composer and mask layers	2018-07-17 15:35:32 +09:00
smoogipoo	55475d129f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 19:19:20 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
AlFasGD	44cf2aa7a3	Sync changes on composition tools	2018-05-22 09:00:11 +03:00
AlFasGD	61a18b952f	Remove useless things	2018-05-21 23:24:10 +03:00
AlFasGD	d504a44dfb	Implement mask layering (incomplete)	2018-05-21 23:08:04 +03:00
DrabWeb	ec53927d8e	Add selection to DrawableRoom.	2018-05-10 22:48:07 -03:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
smoogipoo	fbc50d6030	Merge master into editor-clock	2018-04-12 13:35:53 +09:00
smoogipoo	248be8e35f	HitObjectComposer no longer needs a beat divisor	2018-04-06 18:21:45 +09:00
smoogipoo	c7abd56fc4	Give editor a custom clock to handle seeking	2018-04-06 18:11:37 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
smoogipoo	786e6242e1	Make bdl beat divisor nullable	2018-03-20 14:01:06 +09:00
smoogipoo	b1d09500f2	Integrate beat snap divisor into editor seeking	2018-03-19 20:42:06 +09:00
smoogipoo	e25d1f6982	Pass down editor clocks through DI	2018-03-19 16:27:52 +09:00
Dean Herbert	4b83278cf4	Merge branch 'master' into fix-editor-clocks	2018-03-16 23:32:54 +09:00
smoogipoo	6f7163769d	Adjust comment for readability	2018-03-16 19:57:14 +09:00
Dean Herbert	bca4b620b6	Merge branch 'master' into editor-wheel-movement	2018-03-16 15:56:51 +09:00
smoogipoo	fc15c63a88	Re-order methods	2018-03-15 18:28:08 +09:00
smoogipoo	c937ef5d24	Fix not being able to scroll before the first timing point	2018-03-15 18:26:53 +09:00
smoogipoo	c8f6a6980b	Move clock construction to Editor	2018-03-15 17:27:37 +09:00
smoogipoo	9e0aeec574	Use a decoupled clock for accurate clock times	2018-03-15 17:03:33 +09:00
smoogipoo	50f9d810dd	Add more testcases + fix up seeking a bit more	2018-03-15 15:40:52 +09:00
smoogipoo	0da3ae0944	Add some basic tests + fixes to seek/seekforward functionality	2018-03-14 20:52:48 +09:00
Dean Herbert	81f82d98a1	Rework a lot of naming and structure	2018-03-14 15:18:21 +09:00
smoogipoo	299de4b866	Rewrite seeking to better handle timing point boundaries	2018-03-13 16:54:34 +09:00
smoogipoo	df352c98d6	Change wheel direction to match stable	2018-03-13 14:30:50 +09:00
smoogipoo	e580819621	Rename to seekAmount	2018-03-13 14:08:43 +09:00
smoogipoo	6c148930b5	Don't skip beats when scrolling in the direction of the closest beat	2018-03-13 14:02:37 +09:00
smoogipoo	8acba47a2b	Implement mouse wheel movement in the editor	2018-03-13 11:23:44 +09:00
smoogipoo	8c4bcb4a04	Only accept drag movement on the overlays	2018-03-12 17:33:10 +09:00
smoogipoo	212142429f	Derive from IHasPosition	2018-03-12 17:25:34 +09:00
smoogipoo	4103c66cff	Move selection overlay to HitObjectOverlayLayer for extensibility	2018-03-10 00:48:57 +09:00
smoogipoo	0e8fbc47b7	Give HitObjectOverlayLayer full input state information	2018-03-10 00:03:02 +09:00
smoogipoo	376f6eec58	SetPosition -> OffsetPosition	2018-03-10 00:02:13 +09:00
smoogipoo	ad72d3816b	Allow dragging anywhere in a capture box to move objects	2018-03-09 23:43:50 +09:00
smoogipoo	4a48136e4f	Make hitobject positions adjustable	2018-03-09 23:12:34 +09:00
smoogipoo	3b766b8ec8	Make CaptureBox account for changes in hitobject states	2018-03-09 23:11:48 +09:00
smoogipoo	278b25bcbd	Fix border being the wrong size	2018-02-23 15:29:56 +09:00
smoogipoo	0cdf6fa7e2	Make HitObjectOverlay into an OverlayContainer	2018-02-22 14:36:58 +09:00
smoogipoo	45c579630d	Make selectionLayer handle input below object overlays	2018-02-22 14:34:37 +09:00
smoogipoo	07252254eb	Fix post-merge issues	2018-02-22 14:22:04 +09:00
smoogipoo	99e9eb81f2	Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays	2018-02-22 14:16:01 +09:00
Dean Herbert	7c942eb592	Tidy up layer container logic	2018-02-22 13:42:36 +09:00
smoogipoo	4934ef7429	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-21 11:07:42 +09:00
smoogipoo	7fe0989427	Merge branch 'general-slider-improvements' into editor-hitobject-overlays	2018-02-20 23:51:47 +09:00
smoogipoo	ad2f556133	Add hitobject overlays to selected hitobjects	2018-02-20 18:01:45 +09:00
smoogipoo	2a5bfdb4b8	Deselect hitobjects that are now not in the selection quad	2018-02-20 15:06:51 +09:00
smoogipoo	2f4925d031	Add some xmldocs	2018-02-20 15:06:14 +09:00
smoogipoo	285df52f43	Encapsulate logic for selecting/deselecting further	2018-02-20 14:54:45 +09:00
smoogipoo	995ecb7d94	Make selectedHitObjects into a HashSet for quick Contains checks	2018-02-20 14:48:35 +09:00
smoogipoo	87065a0b13	Rename + publicise DeselectAll	2018-02-20 14:38:57 +09:00
smoogipoo	423fe4eba8	Combine border radiuses of selection and capture boxes	2018-02-20 14:25:42 +09:00
smoogipoo	8f25a5da66	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-20 14:01:33 +09:00
smoogipoo	cbac4de9c2	Expire + dispose CaptureBoxes	2018-02-15 19:11:29 +09:00
smoogipoo	ebcdb62570	Remove now unneeded hide	2018-02-15 19:10:55 +09:00
smoogipoo	9583191556	Dispose SelectionBoxes when they die	2018-02-15 19:08:03 +09:00
smoogipoo	4ac0c48ba6	Add fadein to SelectionBox	2018-02-15 19:07:53 +09:00
smoogipoo	dcbc8c3dcd	Remove animated capture boxes for now	2018-02-15 18:06:33 +09:00
smoogipoo	115484741d	Capture -> Select	2018-02-14 17:54:43 +09:00
smoogipoo	a9d14eadac	Add clearSelection method	2018-02-14 17:53:04 +09:00
smoogipoo	344da5965c	Add a CaptureBox that encloses hitobjects from the drag selection	2018-02-14 14:38:37 +09:00
smoogipoo	bfedd1cee0	Remove nested container	2018-02-12 19:01:50 +09:00
smoogipoo	c3212d36ef	Remove handles for now (will be re-implemented)	2018-02-12 18:36:16 +09:00
smoogipoo	e10bb2db05	Unify SelectionLayer and HitObjectCapturer, rename SelectionBox	2018-02-12 18:35:01 +09:00
smoogipoo	20c0dee17d	Remove SelectionInfo	2018-02-12 18:22:52 +09:00
smoogipoo	ee168f9a77	Split out drag selection box from post-capture box ... Cleans up a lot of code, removes handles for now.	2018-02-12 18:20:05 +09:00
smoogipoo	1adbe3585c	HitObjectSelectionBox -> SelectionDragger	2018-02-12 16:03:59 +09:00
smoogipoo	cfb2b3f1e8	Rework SelctionLayer to support click-selections	2018-02-12 16:02:42 +09:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	a81f32a388	PlayerGroup -> PlayerSettingsGroup	2018-01-15 20:52:52 +03:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dean Herbert	6f5f4f76e5	Use Logger.Error when exceptions are involved	2017-12-25 18:21:15 +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	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	4573cc3322	Refactor into a new DragBox class, representing a single drag	2017-12-11 17:45:03 +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
smoogipoo	f41af191ed	Merge remote-tracking branch 'origin/master' into editor-selection-tool	2017-12-08 15:13:18 +09:00
smoogipoo	a80059032c	Remove PlayfieldOverlay	2017-12-02 20:24:10 +09:00
smoogipoo	5a7c4772bd	Remove PlayfieldUnderlay for now	2017-12-02 19:53:20 +09:00
smoogipoo	cf859a6cf2	Make the dragger attach to objects it surrounds ... Plus a lot more implementation.	2017-12-02 00:26:02 +09:00
smoogipoo	f6591851c3	Implement a selection dragger box	2017-12-01 13:15:58 +09:00
smoogipoo	52ba68e25d	Add/fix up license headers	2017-11-30 22:21:02 +09:00
smoogipoo	c0c051aa32	Remove unused parameter for now	2017-11-30 21:58:41 +09:00
smoogipoo	e8cbde3ae1	Add overlay/underlay	2017-11-30 21:56:19 +09:00
smoogipoo	7e34b0f08d	Remove SelectionTool, make Select the default tool	2017-11-30 19:53:52 +09:00
smoogipoo	677f3653eb	Hide osu! playfield cursor	2017-11-30 19:19:34 +09:00
smoogipoo	efa39f38ca	CI fixes	2017-11-30 18:49:08 +09:00
smoogipoo	e5353bb53e	Add border to playfield, add shadow to toolbox buttons	2017-11-30 17:38:55 +09:00
smoogipoo	456bbe25f3	Implement toolbox into HitObjectComposer	2017-11-30 16:58:14 +09:00
smoogipoo	309eb4edd7	Integrate HitObjectComposer into Compose ... Also removes the other rulesets' HitObjectComposers for now.	2017-11-29 17:46:21 +09:00
smoogipoo	8c30fd490c	Add HitObjectComposer class	2017-11-29 16:22:11 +09:00