279 Commits

Author	SHA1	Message	Date
Dean Herbert	82d6549161	Pass down snap result and remove local TimeAt usage	2020-05-20 21:01:29 +09:00
Dean Herbert	970bd86d2e	Remove local TimeAt usage in mania placement	2020-05-20 21:01:29 +09:00
Dean Herbert	23bf0d000e	Implement mania beat snapping support	2020-05-20 21:01:19 +09:00
Dean Herbert	ffb8d48fc3	Fix osu!mania editor placement regressions	2020-05-20 21:01:03 +09:00
Dean Herbert	c46bfc2532	Create SnapResult class to hold various snapping results	2020-05-20 21:00:47 +09:00
Dean Herbert	3354d48a38	Change snapping to be screen space coordinate based	2020-05-20 21:00:29 +09:00
Dean Herbert	0bc3073d49	Fix test failures	2020-05-20 15:01:32 +09:00
Dean Herbert	d31a59b074	Fix logic results in infinite loop on default timing point return	2020-05-20 14:55:36 +09:00
Dean Herbert	85156c62ef	Add xmldoc and address some code quality concerns	2020-05-19 23:05:08 +09:00
Dean Herbert	c28a9bdb80	Move load method up	2020-05-19 23:02:20 +09:00
Dean Herbert	a6f3dc53f7	Fix time value not being updated for next timing point	2020-05-19 23:01:36 +09:00
Dean Herbert	d56466e2b9	Add very basic pooling of grid lines	2020-05-19 19:07:35 +09:00
Dean Herbert	406f39e8bf	Construct online visible lines	2020-05-18 21:27:26 +09:00
Dean Herbert	b35b150f38	Simplify colouring logic	2020-05-18 19:48:51 +09:00
Dean Herbert	16e85ae0b1	Remove Grid class	2020-05-18 17:52:04 +09:00
Dean Herbert	d9bb90078b	Move grids to inside columns	2020-05-18 17:47:52 +09:00
smoogipoo	238d87f976	Add comment about gray usage	2020-05-15 15:56:32 +09:00
smoogipoo	1c6c128d11	Add const	2020-05-15 15:51:54 +09:00
smoogipoo	392d44e1fb	Always fully display one beat	2020-05-15 15:49:50 +09:00
smoogipoo	4cbd51feb9	Fix test errors	2020-05-15 13:08:15 +09:00
smoogipoo	3441ab457d	Fix hitobjects placed at non-beatsnapped times	2020-05-14 20:06:34 +09:00
smoogipoo	0e33494074	Fix flashing when changing beat divisor	2020-05-14 19:58:39 +09:00
smoogipoo	42c3d892cd	Only update alive lines	2020-05-14 19:55:14 +09:00
smoogipoo	91d1b15d5a	Integrate grid with the mania composer	2020-05-14 19:55:07 +09:00
smoogipoo	16585f767e	Add initial beat snap grid implementation	2020-05-14 19:17:24 +09:00
smoogipoo	0ef3bae26a	Expose playfield from IManiaHitObjectComposer	2020-05-14 18:34:51 +09:00
smoogipoo	78f1b230e9	Disable right-click placement in the mania editor	2020-05-13 14:43:50 +09:00
smoogipoo	db12fafc2c	Update comment	2020-04-28 18:58:29 +09:00
smoogipoo	ff24a15760	Fix vertical drag in down-scroll scenarios	2020-04-28 18:36:24 +09:00
smoogipoo	7d54d4b800	Improve test scene	2020-04-28 18:36:10 +09:00
smoogipoo	f93291e25b	Remove unused override	2020-04-28 18:35:22 +09:00
smoogipoo	e5131400e7	Remove now unnecessary position manipulation	2020-04-28 18:34:39 +09:00
smoogipoo	3eb7c8755c	Cleanup	2020-04-28 15:34:41 +09:00
smoogipoo	7342e00151	Convert positions to local HOC coordinate space	2020-04-28 14:00:14 +09:00
smoogipoo	cebc0fc046	Attempt to fix multiple selection movements	2020-04-27 20:35:24 +09:00
smoogipoo	b88dd44252	Fix movement not working correctly in down-scroll	2020-04-27 19:47:25 +09:00
smoogipoo	acf95fca9c	Remove old, now unnecessary method	2020-04-27 17:14:15 +09:00
smoogipoo	7f5a1d7f44	Merge branch 'master' into fix-mania-selection	2020-04-27 17:09:40 +09:00
smoogipoo	2b0deec491	Finish note placement on mouse down	2020-04-24 13:20:41 +09:00
smoogipoo	4ebb28d3e7	wip	2020-04-23 17:52:54 +09:00
smoogipoo	0a840a2613	Fix mania not getting its own selection handler	2020-04-23 17:41:33 +09:00
smoogipoo	12c235027d	Remove stale file	2020-04-23 13:28:27 +09:00
smoogipoo	22d2607ff5	Only commit if placement is active	2020-04-23 12:53:09 +09:00
smoogipoo	c59096a941	Fix note placement	2020-04-23 12:36:40 +09:00
Dean Herbert	12c21cba7e	Add missing masking specification	2020-04-11 15:20:27 +09:00
smoogipoo	1952fcc0ce	Implement mania hold note skinning	2020-03-31 16:42:35 +09:00
smoogipoo	c4f76ffdaf	Implement mania note skinning	2020-03-31 15:29:25 +09:00
Dean Herbert	0fe41fd50a	Fix blueprint showing even when mouse outside of container	2020-02-13 09:03:48 +09:00
Dean Herbert	e31d69c749	Add commit status to EndPlacement; call BeginPlacement on initial movement	2020-02-07 18:02:48 +09:00
Dean Herbert	289be7a17b	Merge branch 'i-beat-snapping' into timeline-maybe	2020-01-23 15:45:33 +09:00
Dean Herbert	6dd50572d2	Break mania more	2020-01-21 17:37:43 +09:00
Dean Herbert	bd96cf94a6	Begin refactoring SelectionBlueprint to handle non-drawable HitObjects	2020-01-21 12:47:14 +09:00
smoogipoo	bfb056c612	Apply input method signature refactorings	2020-01-20 18:17:21 +09:00
Dean Herbert	d57f55f053	Apply remaining changes required to restore previous functionality	2020-01-15 19:09:49 +09:00
Dean Herbert	ee332e0d42	Split out BlueprintContainer functionality further	2020-01-02 18:21:16 +09:00
smoogipoo	7ac6f68de8	Rewrite hold note input handling	2019-12-23 17:48:57 +09:00
smoogipoo	5861eca80d	Make DrawableRuleset take a converted beatmap	2019-12-12 15:58:11 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	7d7b9e36b2	Use compound assignment.	2019-11-12 19:53:50 +08:00
smoogipoo	1f9f03dc66	Add temporary fix for null references	2019-11-07 13:36:54 +09:00
smoogipoo	8d42e45fd3	Make holdnote notes update lazily	2019-11-07 13:23:00 +09:00
smoogipoo	8141509a71	Split hold note blueprints into separate file	2019-11-07 12:59:05 +09:00
smoogipoo	2c1bfd62ef	Disallow selections to be moved outside of the playfield	2019-11-06 17:28:04 +09:00
smoogipoo	38c2c328ff	Rename HitObject -> DrawableObject in selection blueprints	2019-10-21 17:04:56 +09:00
Dean Herbert	d0eaf629af	Merge branch 'master' into dho-apply	2019-10-18 19:45:10 +09:00
Dean Herbert	e3740fbc77	Merge pull request #6528 from smoogipoo/fix-mania-selection-movement ... Fix mania hitobject selections not moving correctly	2019-10-18 16:28:04 +09:00
smoogipoo	c4cc960e15	Fix mania hitobject selections not moving correctly	2019-10-17 18:00:15 +09:00
smoogipoo	510ce9345f	Fix potential blueprint nullrefs with the new structure	2019-10-17 16:14:28 +09:00
smoogipoo	79b2c7b480	Make BeginPlacement() set the hitobject start time	2019-10-16 20:04:15 +09:00
smoogipoo	8b661e624d	Remove drag from class/method namings + refactor	2019-10-08 19:08:31 +09:00
smoogipoo	08d043f447	Move selection relative to the hitobject start positions	2019-10-08 18:57:03 +09:00
Dean Herbert	0fdb07346b	Merge branch 'master' into fix-mania-placement	2019-10-06 14:22:03 +08:00
smoogipoo	80585d446c	Split applyPositionOffset into two methods and add xmldocs	2019-10-03 18:40:48 +09:00
smoogipoo	f1ff22cf8b	Fix hold note blueprint placing in the wrong direction	2019-10-03 18:40:48 +09:00
smoogipoo	39369620fa	Remove position offset from ColumnAt	2019-10-03 18:40:48 +09:00
smoogipoo	0a409075be	Fix note placement offset not working for down-scroll	2019-10-03 18:40:48 +09:00
smoogipoo	754fbc59e1	Fix note placement being offset	2019-10-03 18:40:48 +09:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
smoogipoo	6641811125	Add EditorWorkingBeatmap for reuse of the playable beatmap	2019-08-29 19:41:12 +09:00
smoogipoo	87e28ab1f9	Remove non-generic DrawableEditRuleset	2019-08-29 18:12:29 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	a1666fb7fa	MouseDownPosition -> DragPosition	2018-11-30 14:21:20 +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	085acf29a0	Fix blueprints behaving incorrectly	2018-11-29 19:29:36 +09:00
Dean Herbert	ab0ce46362	Make hold note placement blueprints look a bit more blueprint-y	2018-11-29 18:13:15 +09:00
Dean Herbert	132d334e15	Merge branch 'master' into hold-note-placement	2018-11-29 17:02:55 +09:00
Dean Herbert	d1c976880c	Fix incorrect margin/spacing handling	2018-11-29 14:15:28 +09:00
smoogipoo	f9f300b215	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Dean Herbert	bfebed053d	Merge branch 'master' into note-placement	2018-11-26 14:19:46 +09:00
smoogipoo	60ffad169f	Fix post-merge errors	2018-11-26 11:47:48 +09:00
smoogipoo	c0fcbc283e	Merge branch 'note-placement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs	2018-11-26 11:47:22 +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
smoogipoo	5d6a438f98	Make selected mania hitobjects always alive	2018-11-26 11:34:25 +09:00
smoogipoo	91aa00b0e9	Add helper method to get column by position	2018-11-26 10:54:54 +09:00
smoogipoo	4ba3fa4ab6	osuTK	2018-11-26 10:44:48 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
Dean Herbert	7de85659ba	Merge branch 'master' into mania-selection-movement	2018-11-21 20:00:46 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	2ee56e4a78	Add a body piece	2018-11-19 18:59:05 +09:00
smoogipoo	ad950cfc90	Implement hold note placement	2018-11-19 18:40:43 +09:00
smoogipoo	8071244d97	Make sizing happen per-blueprint	2018-11-19 18:40:27 +09:00
Dan Balasescu	d9b8d2d15c	Trim whitespace	2018-11-19 18:05:21 +09:00
smoogipoo	d1cbaa9612	Use the column width	2018-11-19 18:02:01 +09:00
smoogipoo	52309465eb	Apply some simple fixes	2018-11-19 17:59:52 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	ce956d7fd4	Fix exception when order of objects changes	2018-11-19 16:19:56 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
smoogipoo	f7fc2ca569	Basic inter-column selection movement	2018-11-15 21:37:22 +09:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09:00
smoogipoo	63642586c4	Merge remote-tracking branch 'origin/master' into mania-selection-movement	2018-11-15 20:47:53 +09:00
Dean Herbert	3fbabdfed2	Merge branch 'master' into notepieces	2018-11-14 17:30:39 +09:00
Dean Herbert	a1dd1057ce	Merge branch 'master' into more-global-scrollalgo	2018-11-14 17:15:24 +09:00
Dean Herbert	8b190edde0	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:32:14 +09:00
smoogipoo	a9a33b1fcb	Implement mania selection movements	2018-11-13 16:42:40 +09:00
smoogipoo	fc0030a391	Use common positional adjustment for note blueprints	2018-11-13 15:45:06 +09:00
smoogipoo	25101ecd2c	Snap placement blueprint to columns	2018-11-13 14:13:29 +09:00
smoogipoo	3d8ef97e81	Add testcase	2018-11-12 19:41:06 +09:00
smoogipoo	1403fa26cf	Fix placement not working correctly for downwards scroll	2018-11-12 19:40:57 +09:00
smoogipoo	1d40a042f6	Extract common methods into ManiaPlacementBlueprint	2018-11-12 18:32:44 +09:00
smoogipoo	3a1fee59fb	Implement note placement	2018-11-12 18:24:18 +09:00
smoogipoo	a0c75a0597	Merge branch 'notepieces' into note-placement	2018-11-12 17:59:54 +09:00
smoogipoo	e302d5d005	Separate NoteSelectionBlueprint into a note piece	2018-11-12 17:59:39 +09:00
smoogipoo	8be6e351f5	Merge branch 'fix-mania-selections' into add-mania-selection-testcase	2018-11-12 17:39:58 +09:00
smoogipoo	e7969ecec7	Move ScrollAlgorithm inside IScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	54668a0dec	Simplify construction of ScrollingInfo	2018-11-12 17:34:35 +09:00
smoogipoo	ad45bc7666	Move scroll direction to scrollinginfo	2018-11-12 17:34:35 +09:00
smoogipoo	9fde7f7f44	Move scrolling info to osu.Game	2018-11-12 17:34:35 +09:00
smoogipoo	e3c60c2f96	Cleanups	2018-11-12 17:18:58 +09:00
Dean Herbert	03af600273	Merge remote-tracking branch 'upstream/master' into fix-mania-selections	2018-11-09 11:35:46 +09:00
smoogipoo	d0b63e8f8d	Fix missing references	2018-11-08 14:13:57 +09:00
smoogipoo	21f8a0a56f	Fix selection box using an incorrect size	2018-11-08 14:02:07 +09:00
smoogipoo	4b1b494893	Fix selection masks not having the correct size	2018-11-08 14:02:07 +09:00
smoogipoo	5d51719572	Make selection blueprints handle position adjustments	2018-11-07 16:21:32 +09:00
smoogipoo	2612fd3099	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
smoogipoo	11be820efe	CreateMaskFor -> CreateBlueprintFor	2018-11-06 18:03:21 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
Dean Herbert	b28c0cd128	Merge branch 'master' into editor-mask-placement	2018-10-31 06:46:48 +09:00
smoogipoo	677d0d4a19	Renamespace ruleset masks	2018-10-26 13:31:38 +09:00
smoogipoo	8703db5cc1	Rename HitObjectMask -> SelectionMask	2018-10-26 13:31:23 +09:00
smoogipoo	d36ac59ca2	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
smoogipoo	f384c7228e	Fix post-merge issues	2018-10-16 17:28:23 +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