4893 Commits

Author	SHA1	Message	Date
Dean Herbert	b8efc59cdc	Update UI components to use new grouping	2019-10-25 20:13:22 +09:00
Dean Herbert	32242f22de	Merge branch 'no-auto-gen' into editor-timing-screen	2019-10-25 20:02:40 +09:00
Dean Herbert	e987db37ec	Add grouping of ControlPoints	2019-10-25 19:52:02 +09:00
Dean Herbert	da6769f0fc	Remove necessity of AutoGenerated flag	2019-10-25 19:43:38 +09:00
Dean Herbert	94ffe03e6e	Group timing points	2019-10-25 19:36:12 +09:00
Dan Balasescu	3692846367	Merge branch 'master' into snapping-refactor	2019-10-25 18:26:14 +09:00
smoogipoo	ae011e8ee8	Fix distance snap grid test scenes	2019-10-25 17:25:46 +09:00
smoogipoo	4ca6a5a0cc	Interface the distance snap provider	2019-10-25 16:50:21 +09:00
smoogipoo	607b4d874a	Refactor flow of snapping through HitObjectComposer	2019-10-25 16:40:30 +09:00
Dean Herbert	351f8d3dd1	Merge branch 'master' into editor-timing-screen	2019-10-25 13:21:56 +09:00
Dean Herbert	e5b5d286fd	Increase spacing to closer match the design	2019-10-25 12:48:34 +09:00
Dean Herbert	07f7944fc6	Fix DateTime display sizing on results screen	2019-10-25 12:22:19 +09:00
Dean Herbert	0b3c7f28af	Merge branch 'master' into fix-dragbox-first-frame	2019-10-24 23:01:32 +09:00
Dean Herbert	fa3350ce2d	Refactor blueprint movement and selection events (#6588) ... Refactor blueprint movement and selection events	2019-10-24 22:58:03 +09:00
smoogipoo	a969914d6e	Mention coordinate space	2019-10-24 18:24:22 +09:00
smoogipoo	d83b9ef0e4	Rename grid snapping methods	2019-10-24 18:18:04 +09:00
smoogipoo	f45f17339c	Implement slider path distance snapping	2019-10-24 18:17:30 +09:00
smoogipoo	7a71352684	Fix drag box being positioned incorrectly for 1 frame	2019-10-24 17:22:14 +09:00
smoogipoo	fb88001c0e	Reorder blueprint addition/removal + add regions	2019-10-24 16:53:34 +09:00
smoogipoo	45bd91f63f	Add special cases for click-selection	2019-10-24 16:14:29 +09:00
smoogipoo	8e4a21bee7	Separate out mouse down/click/up handling	2019-10-24 15:58:22 +09:00
smoogipoo	a07e5a269b	Extract drag events into multiple methods	2019-10-24 15:33:08 +09:00
smoogipoo	f128e99fb2	Remove unused methods	2019-10-24 15:07:04 +09:00
smoogipoo	e04c77178c	Move selection events to BlueprintContainer	2019-10-24 14:58:02 +09:00
smoogipoo	714c89faa4	Move selection drag events to BlueprintContainer	2019-10-24 14:57:58 +09:00
smoogipoo	cef2318cf5	Move drag box drag handling to BlueprintContainer	2019-10-23 18:38:06 +09:00
Dean Herbert	f61d7e4fbe	Add smoothing and tidy code a touch	2019-10-23 17:56:09 +09:00
smoogipoo	c9fec50f63	Remove unnecessary whitespace	2019-10-23 17:00:17 +09:00
smoogipoo	97383b4a37	Show centre point of distance snap grid	2019-10-23 16:58:56 +09:00
smoogipoo	851773a842	Apply adjustments for framework changes	2019-10-23 14:04:06 +09:00
Dean Herbert	c06f142433	Fix some spacing and references	2019-10-23 11:22:55 +09:00
Dean Herbert	6866d27634	Merge remote-tracking branch 'upstream/master' into editor-timing-screen	2019-10-23 11:18:42 +09:00
Dean Herbert	5e22eed131	Add add/remove buttons	2019-10-22 21:50:21 +09:00
Dean Herbert	4883844c4c	Add basic information display for all types of control points	2019-10-22 20:57:56 +09:00
Dean Herbert	81e8b678d3	Update editor time when a new timing point is selected	2019-10-22 20:17:19 +09:00
Dean Herbert	25601ac17c	Merge branch 'master' into editor-timing-screen	2019-10-22 18:01:53 +09:00
Dean Herbert	001eae2c02	Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable	2019-10-22 15:04:16 +09:00
Joehu	f7924d3bad	Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"	2019-10-21 16:00:09 -07:00
Dean Herbert	0bf35faae8	Update incorrect reference	2019-10-21 19:25:56 +09:00
Dean Herbert	e3fa5f1da3	Merge branch 'master' into beatsnap-grid-integration	2019-10-21 18:44:34 +09:00
Dean Herbert	b157aaead1	Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration	2019-10-21 17:09:43 +09:00
smoogipoo	38c2c328ff	Rename HitObject -> DrawableObject in selection blueprints	2019-10-21 17:04:56 +09:00
smoogipoo	fc7e4680a7	Split on multiple lines	2019-10-21 14:08:28 +09:00
Dean Herbert	80bf68c108	Add control sections and hook up bindable control groups	2019-10-21 00:06:38 +09:00
Dean Herbert	0fbba9a5e5	Split out more classes	2019-10-20 23:42:13 +09:00
Dean Herbert	07286c0cfc	Fix editor's clock not being processed unless composer is loaded	2019-10-18 18:21:53 +09:00
Dean Herbert	ffec960b77	Split out classes	2019-10-18 17:59:54 +09:00
Dean Herbert	71d45d41d1	Add basic visualisation of different control point types	2019-10-18 17:57:37 +09:00
Dean Herbert	f22ec6f5bd	Merge branch 'master' into editor-timing-screen	2019-10-18 16:57:46 +09:00
smoogipoo	463079e148	Implement placement snapping	2019-10-18 13:48:59 +09:00
smoogipoo	ba4402207a	Implement selection time snapping	2019-10-18 12:53:38 +09:00
smoogipoo	1dc7c59853	Implement selection position snapping	2019-10-18 12:53:27 +09:00
smoogipoo	bc76a9cb8c	Expose selection changed event from BlueprintContainer	2019-10-18 12:40:27 +09:00
smoogipoo	c5ee533524	Merge branch 'dho-apply' into beatsnap-grid-integration	2019-10-18 12:38:29 +09:00
Joehu	e5b50b5e1f	Fix slider bar regression when using arrows	2019-10-17 13:54:36 -07:00
smoogipoo	510ce9345f	Fix potential blueprint nullrefs with the new structure	2019-10-17 16:14:28 +09:00
Dean Herbert	f92331531c	Rename grid to DistanceSnap to be more in line with its purpose	2019-10-17 15:32:02 +09:00
Dan Balasescu	05c6d1a66d	Merge branch 'master' into osu-beatsnapping-grid	2019-10-16 20:12:31 +09:00
smoogipoo	b6b8098b98	Add an arbitrary offset to prevent div-by-0	2019-10-16 19:44:53 +09:00
smoogipoo	2d4b7dc361	Remove redundant code	2019-10-16 19:33:18 +09:00
smoogipoo	5ac5e34f85	Use a cleaner distance function	2019-10-16 19:32:45 +09:00
Joehu	649951198e	Make most textbox carets movable	2019-10-15 14:47:48 -07:00
Joehu	ccc753a315	Make OverlayContainers with no blocking input VisibilityContainers	2019-10-14 16:27:59 -07:00
Dean Herbert	f3c38ae089	Merge branch 'master' into osu-beatsnapping-grid	2019-10-13 18:38:57 +09:00
Dean Herbert	00f0957cc3	Merge branch 'master' into editor-grids-2	2019-10-12 23:28:51 +09:00
Dan Balasescu	bb7de50697	Merge pull request #6451 from peppy/fix-resume-from-player-audio ... Fix audio playback position being reset after resuming to song select	2019-10-11 19:44:00 +09:00
Dean Herbert	00d4d976b7	Move editor selections relative to hitobject start positions (#6431) ... Move editor selections relative to hitobject start positions	2019-10-11 19:35:11 +09:00
Dan Balasescu	26a33bfa4e	Merge branch 'master' into fix-resume-from-player-audio	2019-10-11 19:21:14 +09:00
Dean Herbert	de13320a2d	Add initial table display	2019-10-11 18:46:05 +09:00
smoogipoo	45835f97a1	Split out grids into separate files	2019-10-11 18:41:17 +09:00
smoogipoo	050d86a741	Always use the local coordinate space	2019-10-11 18:24:33 +09:00
smoogipoo	9ecec806c2	Rename grid creation method + parameter	2019-10-11 18:24:33 +09:00
smoogipoo	5f0cd356d7	Rename startPosition to centrePosition	2019-10-11 18:24:33 +09:00
smoogipoo	8fb2628f9e	Improve xmldocs	2019-10-11 18:24:33 +09:00
smoogipoo	66e0fef85b	Expose StartPosition for derived grids to use	2019-10-11 18:24:33 +09:00
smoogipoo	97d4a8e59e	Remove unnecessary dependency	2019-10-11 18:24:33 +09:00
smoogipoo	2df519ddfa	Simplify colour retrieval function	2019-10-11 18:24:33 +09:00
smoogipoo	2aa3d0bb39	Implement base class for beat snapping grids	2019-10-11 18:24:33 +09:00
Dan Balasescu	d4282473c6	Merge branch 'master' into fix-background-disposal	2019-10-11 17:15:30 +09:00
Dean Herbert	937dbb7bf6	Initial layout for timing screen	2019-10-11 16:22:24 +09:00
Dean Herbert	8255a94cd4	Merge branch 'master' into fix-resume-from-player-audio	2019-10-10 22:08:20 +09:00
Dan Balasescu	356c0fdca0	Merge branch 'master' into cleanup-intros	2019-10-10 21:58:54 +09:00
Dean Herbert	5eba33e876	Simplify logic and add test coverage for remaining case	2019-10-10 20:12:47 +09:00
Dean Herbert	e66f9adb86	Fix user pause not being cancelled when playing audio	2019-10-10 16:53:03 +09:00
smoogipoo	2e2768870f	Merge remote-tracking branch 'origin/master' into editor-selection-movement-params	2019-10-10 16:38:41 +09:00
Dan Balasescu	5497d210b6	Merge branch 'master' into fix-editor-slider-display	2019-10-10 16:22:30 +09:00
Dean Herbert	f74c79c2b8	Fix audio playback position being reset after resuming to song select	2019-10-10 11:58:43 +09:00
Dean Herbert	51bf600ea7	Use empty hitwindows instead of null	2019-10-09 19:08:31 +09:00
Dean Herbert	0681bb9a2b	Fix potential nullref	2019-10-09 16:49:10 +09:00
Dean Herbert	2d8e5615e4	Extract timeline and layout logic from ComposeScreen	2019-10-09 16:05:55 +09:00
Dean Herbert	3dd2b18ff0	Make EditorScreen abstract	2019-10-09 16:04:58 +09:00
Dan Balasescu	69b9e359bf	Merge branch 'master' into fix-ss-track-playback	2019-10-09 12:26:07 +09:00
smoogipoo	179656788d	Remove unnecessary method	2019-10-08 19:27:59 +09:00
smoogipoo	c1db11fa06	More removal of "drag"	2019-10-08 19:24:58 +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	4e026b163c	Don't resume playback when user has paused and track hasn't changed	2019-10-08 15:04:38 +09:00
Dean Herbert	3e904b4838	Fix naming of file	2019-10-08 14:37:56 +09:00
Dean Herbert	63bf8ff832	Better signify under construction screens in editor	2019-10-08 14:32:48 +09:00
Dan Balasescu	73e3dac64b	Merge branch 'master' into fix-editor-skinning	2019-10-08 13:28:10 +09:00
Dean Herbert	24269c0384	Fix skins not being displayed correctly in the editor	2019-10-08 12:52:34 +09:00
Dean Herbert	5472029ffe	Fix editor defaulting to 0.5x playback speed	2019-10-08 12:27:51 +09:00
Dean Herbert	52770f803d	Fix incorrect beatmap usage	2019-10-08 12:15:32 +09:00
Dean Herbert	cbb120cd38	Switch beatmap to private	2019-10-08 12:09:42 +09:00
Dean Herbert	c280bee894	Protect configuration bindables	2019-10-08 12:08:47 +09:00
Dean Herbert	b8b2ff2674	Move welcome to local usages	2019-10-08 12:07:59 +09:00
Dean Herbert	4ba2dccde3	Reorder file contents	2019-10-08 12:05:52 +09:00
Dean Herbert	a0bb193342	Remove unnecessary beatmap storage	2019-10-08 12:04:13 +09:00
Dean Herbert	449e53ee6d	Centralise track handling	2019-10-08 12:03:42 +09:00
Dean Herbert	c3d56088d8	Make constant private	2019-10-08 11:54:39 +09:00
Dean Herbert	3c0b1be7f4	Add xmldoc where applicable	2019-10-08 11:52:16 +09:00
Dean Herbert	393683f8f1	Merge branch 'master' into cleanup-intros	2019-10-08 11:29:13 +09:00
Dean Herbert	e7fc5e556c	Fix song select not correctly playing tracks in some cases	2019-10-08 11:06:07 +09:00
Dean Herbert	bb161222ef	Merge branch 'master' into fix-tab-controls-overflowing	2019-10-08 10:12:03 +09:00
Joehu	9fdbe58326	Fix dropdown header padding when selected mod filter is hidden	2019-10-07 16:17:58 -07:00
Joehu	8e6e90eaec	Use fixed numbers for padding instead	2019-10-07 16:11:40 -07:00
Dean Herbert	f15953d65c	Fix carousel including filtered difficulties in sort comparisons	2019-10-07 15:17:03 +09:00
Joehu	11d937beab	Fix beatmap detail area tab dropdown being blocked by content	2019-10-06 10:24:33 -07:00
Joehu	38c1cee5fd	Fix tab controls overflowing	2019-10-06 10:22:55 -07:00
Dean Herbert	2e20380d07	Merge branch 'master' into placement-blueprint-movement	2019-10-06 13:52:22 +08:00
Joehu	e257f4ca04	Resume music to same position when exiting gameplay	2019-10-05 10:31:44 -07:00
Joehu	a71db11ea5	Remove depth parameter description	2019-10-04 18:38:44 -07:00
Joehu	5d460eaf6b	Remove depth specification and button order regression	2019-10-04 17:14:19 -07:00
Joehu	e7ba6ef5c4	Fix keybinding order of beatmap options	2019-10-04 14:32:43 -07:00
Dean Herbert	6fce646369	Merge branch 'master' into placement-blueprint-movement	2019-10-04 19:05:56 +08:00
Dean Herbert	9eab56e2fc	Merge branch 'master' into editor-beatmap-changed-event	2019-10-04 17:58:58 +08:00
Dean Herbert	49fdb4b731	Fix Alt-F4 being blocked during gameplay (#6369) ... Fix Alt-F4 being blocked during gameplay Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-10-04 13:33:00 +08:00
Dean Herbert	47c1f36f9d	Add ValidForResume check	2019-10-04 11:41:53 +08:00
Dean Herbert	71985c7ef1	Update fail logic to match	2019-10-04 11:23:42 +08:00
Dean Herbert	d2c9a29c0d	Remove unnecessary local assign	2019-10-04 10:45:18 +08:00
smoogipoo	a5e1cb8feb	Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge	2019-10-04 11:21:33 +09:00
Joseph Madamba	d87f6d270b	Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays	2019-10-03 08:43:31 -07:00
smoogipoo	636913a4a6	Refactor PlayerLoader changes	2019-10-03 19:22:41 +09:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
smoogipoo	3fb0b0b668	Rename to StartTimeChanged and add xmldocs	2019-10-03 14:37:16 +09:00
smoogipoo	897b3233af	Add start time tracking to EditorBeatmap	2019-10-03 14:23:48 +09:00
Joehu	8017788521	Revert "Fix alt-f4 being blocked in interface" ... This reverts commit 752dd26a4f.	2019-10-02 16:08:24 -07:00
Joehu	148089f160	Revert "Remove unnecessary exitConfirmed condition check" ... This reverts commit 38fe519c91.	2019-10-02 16:08:19 -07:00
Joehu	38fe519c91	Remove unnecessary exitConfirmed condition check	2019-10-02 12:28:48 -07:00
Joehu	752dd26a4f	Fix alt-f4 being blocked in interface	2019-10-02 11:17:43 -07:00
Joehu	a69b9f1148	Fix alt-f4 being blocked during gameplay	2019-10-02 11:16:31 -07:00
Craftplacer	4d4e846296	Merge branch 'master' into muted-notification	2019-10-02 17:31:34 +02:00
Craftplacer	6929847b08	Remove redundant override	2019-10-02 17:22:34 +02:00
Dan Balasescu	2519fd26a9	Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens ... Simplify exit logic of screens with textboxes using back button receptor	2019-10-02 18:38:06 +09:00
HDragonHR	faf8fe132e	Change bindable int to float	2019-10-02 12:26:46 +08:00
Craftplacer	5f399add82	Resolve @iiSaLMaN 's suggested changes	2019-10-01 18:15:40 +02:00
Craftplacer	2ac5e0bfa0	Make use of SessionStatics	2019-10-01 17:39:01 +02:00
Joehu	5f700f2ae9	Simplify exit logic of screens with textboxes using back button receptor	2019-10-01 08:26:34 -07:00
Craftplacer	4e394e0ed5	Merge branch 'master' into muted-notification	2019-10-01 17:26:11 +02:00
Dean Herbert	ce62f3c75b	Simplify and future-proof random retrieval method ... Will support future added intros without further code changes. Also uses RNG instead of `new Random`.	2019-09-29 14:35:35 +08:00