7154 Commits

Author	SHA1	Message	Date
Dean Herbert	c070c69522	Update framework	2018-02-22 15:01:53 +09:00
smoogipoo	0cdf6fa7e2	Make HitObjectOverlay into an OverlayContainer	2018-02-22 14:36:58 +09:00
Dean Herbert	871bcb4142	Merge branch 'master' into sign-in-edits	2018-02-22 14:35:29 +09:00
smoogipoo	45c579630d	Make selectionLayer handle input below object overlays	2018-02-22 14:34:37 +09:00
Dan Balasescu	6cc54a464c	Merge branch 'master' into editor-hitobject-overlays	2018-02-22 14:25:27 +09:00
smoogipoo	07252254eb	Fix post-merge issues	2018-02-22 14:22:04 +09:00
Dean Herbert	ee9a45cc45	Merge branch 'master' into sign-in-edits	2018-02-22 14:18:49 +09:00
Dean Herbert	f2b3d9a0e8	Change some missed instances	2018-02-22 14:17:35 +09:00
smoogipoo	99e9eb81f2	Merge remote-tracking branch 'origin/master' into editor-hitobject-overlays	2018-02-22 14:16:01 +09:00
Dean Herbert	a3336f2577	Merge branch 'master' into fix-editor-osu-scale	2018-02-22 14:14:41 +09:00
smoogipoo	ded2644df8	Merge branch 'master' into editor-hitobject-overlays	2018-02-22 14:08:36 +09:00
Joseph Madamba	3d4bed462b	Reword sign in text	2018-02-21 20:54:47 -08:00
Dean Herbert	7c942eb592	Tidy up layer container logic	2018-02-22 13:42:36 +09:00
Dean Herbert	b74cfffc6f	Merge branch 'master' into editor-hitobject-movement	2018-02-22 13:19:39 +09:00
Dean Herbert	c84ded258f	Reset mouse confine mode on input setting reset hotkey	2018-02-22 10:08:56 +09:00
smoogipoo	5faec5c2f1	Add a separate property to control playfield area	2018-02-21 20:54:33 +09:00
smoogipoo	6757be2007	Fix incorrect RelativeChildSize in Catch	2018-02-21 20:15:51 +09:00
smoogipoo	f012cce668	Rewrite some xmldocs to make methods easier to understand	2018-02-21 17:33:22 +09:00
smoogipoo	4934ef7429	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-21 11:07:42 +09:00
smoogipoo	7fd7dc1538	Extract playfield scaling into a separate class ... And make it more general.	2018-02-21 11:07:42 +09:00
Dean Herbert	ba10eb5e50	Merge branch 'master' into osu-rulesetcontainer-aspect	2018-02-21 10:13:44 +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
Dean Herbert	cce7855bf9	Merge branch 'master' into fix-selection-border-radius	2018-02-20 15:28:51 +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
Dan Balasescu	3d7f998c9b	Merge branch 'master' into osu-rulesetcontainer-aspect	2018-02-20 14:07:04 +09:00
smoogipoo	4da93e8f1d	Merge remote-tracking branch 'origin/master' into editor-hitobject-movement	2018-02-20 14:03:47 +09:00
smoogipoo	8f25a5da66	Add playfield aspect ratio + scaling modifications to composer layers	2018-02-20 14:01:33 +09:00
smoogipoo	4a5cd6520c	Extract playfield scaling into a separate class ... And make it more general.	2018-02-20 13:50:31 +09:00
Dean Herbert	835136aecb	Merge branch 'master' into api-interface	2018-02-20 09:33:53 +09:00
Dean Herbert	f41a40be15	Merge branch 'master' into editor-hitobject-movement	2018-02-19 17:59:50 +09:00
Dean Herbert	fae6ea1ee2	Merge branch 'master' into storyboard-improvements	2018-02-19 17:28:53 +09:00
smoogipoo	4898c321f8	Merge branch 'osu-rulesetcontainer-aspect' into editor-hitobject-movement	2018-02-19 17:07:03 +09:00
smoogipoo	b7be162f28	Remove AspectAdjust property (override GetAspectAdjustedSize instead)	2018-02-19 17:05:10 +09:00
smoogipoo	cd2c9a9de6	Adjust xmldoc and rename to GetAspectAdjustedSize	2018-02-19 17:04:18 +09:00
Dean Herbert	d70d40e3b8	Add back forgotten score store to valid importers	2018-02-19 15:52:14 +09:00
Dan Balasescu	34f76a4136	Merge branch 'master' into storyboard-improvements	2018-02-19 15:40:09 +09:00
Dan Balasescu	80010dd845	Merge branch 'master' into api-interface	2018-02-19 15:24:50 +09:00
Dan Balasescu	5401b0dfcd	Merge branch 'master' into abstract-model-managers	2018-02-19 14:56:21 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	57e61b0b0e	Update xmldoc	2018-02-19 14:50:42 +09:00
Dean Herbert	8b89735e9e	Improve xmldoc for DatabaseContextFactory.Get	2018-02-19 14:17:41 +09:00
Dean Herbert	a7915e7041	Fix typo	2018-02-19 14:00:48 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	58af66bfc0	Merge branch 'master' into editor-hitobject-movement	2018-02-16 13:59:11 +09:00