209 Commits

Author	SHA1	Message	Date
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
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	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	1164108a95	Renamespace ruleset masks	2018-10-03 13:45:41 +09:00
smoogipoo	4cdb6dcea5	Rename HitObjectMask -> SelectionMask	2018-10-03 13:28:00 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
smoogipoo	0bc2bcaf14	Remove GetAspectAdjustedSize() and PlayfieldArea	2018-09-21 15:14:49 +09:00
Dan Balasescu	824c217a0d	Adjust comment	2018-07-19 19:46:03 +09:00
smoogipoo	c3c270621b	Fix hold note note masks blocking mouse input	2018-07-19 19:32:47 +09:00
smoogipoo	be297ddf76	Fix direction reversal not quite working correctly	2018-07-19 19:30:20 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
smoogipoo	54e288f09b	Correctly give note masks a scrolling info	2018-07-17 16:55:50 +09:00
smoogipoo	6437fdd9db	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-07-17 16:46:48 +09:00
smoogipoo	c51fe6a119	Remove more unused stuff	2018-07-17 16:01:47 +09:00
smoogipoo	48c1561676	Remove now unnecessary mask layer	2018-07-17 16:01:14 +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	577ff4cc7f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs	2018-07-17 13:13:57 +09:00
smoogipoo	ce7a5e8914	Update visual style to match new notes	2018-06-07 19:19:32 +09:00
smoogipoo	24b314b51f	Fix hold note masks not working	2018-06-07 19:00:02 +09:00
smoogipoo	f299ae0fbd	Fix positioning	2018-06-07 18:59:52 +09:00
smoogipoo	cd532cde2d	Fix note masks not working	2018-06-07 18:28:49 +09:00
smoogipoo	d1b469c1a3	Better handling of nested playfields' hitobjects	2018-06-07 16:28:21 +09:00
smoogipoo	279a2844f0	Actually make ManiaHitObjectComposer constructible/testable	2018-06-07 16:08:37 +09:00
AlFasGD	c7dfe88ad2	Complete PR's independence	2018-05-22 09:18:02 +03:00
AlFasGD	a178c44b60	Remove snap line dependencies	2018-05-22 09:12:51 +03:00
AlFasGD	8aac1f50ee	Remove more dependencies	2018-05-22 09:12:22 +03:00
AlFasGD	2769f6c47b	Fix issues	2018-05-22 09:09:25 +03:00
AlFasGD	bbe7765a95	Add files to not require dependencies from #2534	2018-05-22 09:03:47 +03:00
AlFasGD	d504a44dfb	Implement mask layering (incomplete)	2018-05-21 23:08:04 +03:00