318 Commits

Author	SHA1	Message	Date
AlFasGD	e44062b77a	Fix tests and implementation	2018-05-08 16:37:06 +03:00
AlFasGD	dd9b9a18ac	Prevent user from scrolling outside the timeline in the editor	2018-05-08 16:21:54 +03:00
smoogipoo	674e45d49b	Fix beatmap/ruleset being changeable while in the editor	2018-05-07 16:32:15 +09:00
Dean Herbert	93b77d9cfe	Remove annotation	2018-04-23 22:22:31 +09:00
Dean Herbert	ff3d3379f0	Merge remote-tracking branch 'upstream/master' into async-screens	2018-04-23 18:29:37 +09:00
Dean Herbert	194992936d	Use exceptions	2018-04-23 17:57:47 +09:00
Dean Herbert	6e16f2a3c3	Add assert to appease rider/r#	2018-04-23 15:03:41 +09:00
Dean Herbert	e9e97f31d6	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 19:06:47 +09:00
smoogipoo	0dce7a5b61	Update framework + fix CI errors	2018-04-20 18:19:17 +09:00
Dean Herbert	de85436534	Merge remote-tracking branch 'upstream/master' into peppy-async-screens	2018-04-20 16:52:58 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	127f0d7b01	Fix smoogipoo's comments	2018-04-12 21:17:17 +09:00
Dean Herbert	0ca703beaa	Add some missing xmldoc	2018-04-12 21:04:45 +09:00
smoogipoo	a2484fbf56	Move back to DI-ing adjustable clock into SummaryTimeline	2018-04-12 13:37:02 +09:00
smoogipoo	fbc50d6030	Merge master into editor-clock	2018-04-12 13:35:53 +09:00
smoogipoo	e59124962c	Remove re-instantiation of clock in EditorClockTestCase	2018-04-06 18:38:44 +09:00
smoogipoo	9e8490735f	Fix Compose not binding to the editor's beat divisor	2018-04-06 18:22:24 +09:00
smoogipoo	c7abd56fc4	Give editor a custom clock to handle seeking	2018-04-06 18:11:37 +09:00
smoogipoo	f07928446d	Remove instances of "waveform"	2018-04-06 15:52:39 +09:00
smoogipoo	9b060b1bdf	Fix delay in value retrieval causing offsetting when zooming	2018-04-06 15:51:40 +09:00
smoogipoo	d9e795fb9f	TimelineContainer -> TimelineArea	2018-04-05 19:40:03 +09:00
smoogipoo	a84536d343	ScrollingTimelineContainer -> Timeline	2018-04-05 19:33:47 +09:00
smoogipoo	f41d31e1db	ScrollableTimeline -> TimelineContainer	2018-04-05 19:33:25 +09:00
smoogipoo	9a9ed1d630	Encapsulate zoom logic into a separate class	2018-04-05 19:30:54 +09:00
smoogipoo	0141cbebba	waveformContainer -> zoomedContent	2018-04-05 19:08:10 +09:00
smoogipoo	8da3c2c52a	Expose zoom publicly again, re-enable zoom buttons	2018-04-05 19:05:19 +09:00
smoogipoo	35e116cb12	Reduce ctor arguments	2018-04-05 19:04:07 +09:00
smoogipoo	eff5eddbe9	Make zoom an int again	2018-04-05 18:41:22 +09:00
smoogipoo	074dee3a83	Re-implement mousewheel zoom	2018-04-05 18:37:51 +09:00
smoogipoo	e3af32ad2f	A bit of cleanup	2018-04-05 17:07:41 +09:00
smoogipoo	9bb3e56bb3	Implement half-width overflows	2018-04-05 17:07:00 +09:00
smoogipoo	e7aa1d9c38	Temporarily remove zoom levels, simplify scrollingtimelinecontainer	2018-04-05 16:12:21 +09:00
smoogipoo	870ce8868c	Make scrollabletimeline use gridcontainer	2018-04-05 16:07:33 +09:00
Dean Herbert	31ade986a7	Scren async changes in line with framework changes ... Makes editor not stutter on load, amongst other screens.	2018-03-30 14:58:11 +09:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
smoogipoo	ffa712dccb	Fix post-merge issues	2018-03-24 15:19:45 +09:00
smoogipoo	2b7d22c4ea	Very slightly reduce size of slider bar to increase bottom padding	2018-03-22 20:11:55 +09:00
Dean Herbert	dade52d15d	Fix vertical padding	2018-03-22 16:15:14 +09:00
Dean Herbert	271c082606	Adjust colour assignment	2018-03-21 16:25:32 +09:00
Dean Herbert	48142602ea	Adjust text size to match design	2018-03-21 16:04:43 +09:00
Dean Herbert	63f0419d6a	Apply minor fixes	2018-03-21 15:40:43 +09:00
Dean Herbert	8ac660b0c6	Fixes for keyboard handling and general code quality	2018-03-20 22:25:15 +09:00
Dean Herbert	aa8b0d017c	Adjust colours and spacing	2018-03-20 21:59:56 +09:00
Dean Herbert	dac1ba21db	Make keyboard control work	2018-03-20 21:38:22 +09:00
Dean Herbert	045610dbfe	Adjust styling and colours	2018-03-20 21:31:17 +09:00
Dean Herbert	c2eb32c0e9	DrawableBeatDivisor -> BeatDivisorControl	2018-03-20 20:10:27 +09:00
Dean Herbert	6fd650777c	Move value change logic to bindable ... Also add drag support	2018-03-20 20:09:55 +09:00
smoogipoo	50192b21e3	Give DrawableBeatDivisor a ctor	2018-03-20 13:57:25 +09:00
smoogipoo	b1d09500f2	Integrate beat snap divisor into editor seeking	2018-03-19 20:42:06 +09:00
smoogipoo	c5eab7a227	Actually rename to DrawableBeatDivisor...	2018-03-19 20:34:24 +09:00
smoogipoo	5ecbc5612c	Integrate with dependency injection	2018-03-19 20:33:58 +09:00
smoogipoo	4c0ccffe08	Merge remote-tracking branch 'origin/master' into beat-snap-divisor	2018-03-19 20:23:15 +09:00
smoogipoo	df0b8a24c5	Rename + renamespace	2018-03-19 20:21:19 +09:00
smoogipoo	879dbc75b5	Nest TickContainer in BeatSnapVisualiser	2018-03-19 20:20:29 +09:00
smoogipoo	b25c564ecb	Integrate into editor's compose screen	2018-03-19 20:14:58 +09:00
smoogipoo	32fecc6ff4	Adjust icon scale + text	2018-03-19 20:14:34 +09:00
smoogipoo	e96dad441d	Offset the icon buttons a little bit to look a bit more centered ... Maybe it's just me, but this is really triggering me.	2018-03-19 20:14:13 +09:00
smoogipoo	c86ddb7ee3	Add slight easing to marker movements	2018-03-19 19:57:02 +09:00
smoogipoo	fbc92bfa01	Add previous/next divisor button actions	2018-03-19 19:55:49 +09:00
smoogipoo	070db63157	Privatise tick to TickContainer	2018-03-19 19:52:22 +09:00
smoogipoo	7182442b21	Add divisor text	2018-03-19 19:49:57 +09:00
smoogipoo	6b035e8c53	Add basic structure/layout for the beat snap visualiser	2018-03-19 19:46:26 +09:00
Dean Herbert	4b812279bb	Merge branch 'master' into fix-editor-clocks	2018-03-19 19:06:38 +09:00
smoogipoo	8d4c9eda48	Fix attempting to add selection boxes with no selection ... E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.	2018-03-19 18:00:11 +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	d05947ef48	Pass adjustable clocks to components, rather than relying on the track	2018-03-15 18:19:28 +09:00
smoogipoo	c8f6a6980b	Move clock construction to Editor	2018-03-15 17:27:37 +09:00
smoogipoo	5e742eb466	Move editor constructions to BDL load	2018-03-15 17:10:08 +09:00
Dean Herbert	81f82d98a1	Rework a lot of naming and structure	2018-03-14 15:18:21 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
Dan Balasescu	3bfa6bd9fd	Merge branch 'master' into better-notification-delays	2017-12-27 23:26:57 +09:00
Dean Herbert	ae9f08f387	Fix crash in editor when trying to seek on a virtual track	2017-12-27 11:47:04 +09:00
Dean Herbert	71a94d6b44	Add a bindable Enabled flag to NotificationManager ... Also better handles delays before notifications are displayed.	2017-12-25 20:53:23 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
smoogipoo	2fb8895e66	Add spacer to menu	2017-12-21 19:57:09 +09:00
smoogipoo	b2c0b013aa	Remove migration setting in favour of export option in the editor	2017-12-21 19:56:12 +09:00
Dean Herbert	7957e55710	Merge branch 'master' into editor-composer	2017-12-03 14:47:07 +09:00
smoogipoo	2852337b04	Remove unused using	2017-12-02 20:35:47 +09:00
smoogipoo	cd20d6df16	Apply suggested changes	2017-12-02 20:31:15 +09:00
smoogipoo	c14d68e685	Use OsuColour for radio buttons	2017-12-02 20:30:18 +09:00
smoogipoo	5be00cb0ec	Add todo	2017-12-01 18:40:55 +09:00
smoogipoo	0b95e36675	Fix RelativeChildSize error temporarily	2017-12-01 18:00:20 +09:00
smoogipoo	89772f4efd	A few resharper fixes	2017-11-30 19:54:58 +09:00
smoogipoo	e9cbef88f1	Improve selection/deselection behaviour of RadioButtonCollections	2017-11-30 19:50:07 +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	73e41f9dde	Add constructors to RadioButton	2017-11-30 16:57:30 +09:00
smoogipoo	ead7456978	Add compose radio buttons + testcase	2017-11-30 15:43:19 +09:00
smoogipoo	abd6125691	Make sure that composerContainer is cleared for testing purposes	2017-11-30 14:00:17 +09:00
smoogipoo	a7a9569aee	Don't exit when we don't have composer for now	2017-11-30 13:53:57 +09:00
smoogipoo	ee35422efc	Handle rulesets that don't support composition a bit better	2017-11-29 18:38:12 +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	f586cbac32	Restructure Compose to use grids and eventually support HitObjectContainer	2017-11-29 16:47:52 +09:00
Dean Herbert	36d45f633d	Reorder methods	2017-11-22 11:57:09 +09:00
Dean Herbert	e3c5a599b6	Tidy some regressions	2017-11-22 11:36:29 +09:00
Dean Herbert	27fb598352	Update colours to match design	2017-11-22 11:34:54 +09:00
Dean Herbert	0f8499c580	Rename to PlaybackControl and add a TestCase	2017-11-22 11:22:46 +09:00
Dean Herbert	ff5404e57f	Remove need for AlwaysPresent ... Also self-contains the tab options inside the tab control.	2017-11-22 11:21:48 +09:00
Dean Herbert	855acc9401	Fix leading space before percent sign	2017-11-22 11:17:10 +09:00
Dean Herbert	c06d6d0bbb	Rename weird method	2017-11-22 10:59:31 +09:00
Dean Herbert	461c8e8be0	Clean up state change logic	2017-11-22 10:55:06 +09:00
Dean Herbert	63d366ea4b	Bindables should be readonly	2017-11-22 10:54:33 +09:00
EVAST9919	41498ffad3	Apply suggestions	2017-11-21 12:22:19 +03:00
smoogipoo	0d1b5ae44f	Adjust bottom bar sizing as suggested	2017-11-21 17:51:07 +09:00
smoogipoo	238756ec5d	Merge remote-tracking branch 'origin/master' into editor-playback-speed	2017-11-21 17:41:16 +09:00
Dean Herbert	4f6263ef86	Make many internal classes and methods public ... This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.	2017-11-21 12:06:16 +09:00
EVAST9919	ecc2877be6	Fix possible null and adjust timeline width	2017-11-20 09:29:26 +03:00
EVAST9919	4ee3a89c12	Remove using	2017-11-18 08:35:00 +03:00
EVAST9919	34d8f94f99	Add track timer	2017-11-18 08:24:09 +03:00
EVAST9919	58e7263108	CI fixes	2017-11-18 03:09:09 +03:00
EVAST9919	0b8fed4e5a	Remove useless Dimention params	2017-11-18 01:51:23 +03:00
EVAST9919	7492ab6495	Use GridContainer to place the bottom bar objects	2017-11-18 01:48:50 +03:00
EVAST9919	07e0aba01c	Remove using	2017-11-17 14:10:13 +03:00
EVAST9919	1680c0905f	Fix track tempo could be less than 1 on exiting the editor	2017-11-17 14:02:07 +03:00
EVAST9919	cc04d5bc61	Add all the objects to the PlaybackContainer	2017-11-17 13:35:41 +03:00
EVAST9919	d62da4334e	Add and place all the bottom bar objects	2017-11-17 12:26:13 +03:00
smoogipoo	cd8d7af9db	Clean up a few warnings in preparation for net-standard	2017-11-14 13:06:25 +09:00
Dean Herbert	6fa02ce9bb	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 17:10:54 +09:00
smoogipoo	04b271cce9	Migrate osu.Game project to VS2017 project structure	2017-10-30 22:24:11 +09:00
Dean Herbert	dc9c474033	Move all TestCases to Testing project ... This allows tests to successfully retrieve rulesets, as they are referenced.	2017-10-23 19:32:02 +09:00
Dean Herbert	c0d64bf409	Use Gray instead of FromHex for grays	2017-10-12 22:19:29 +09:00
Dean Herbert	37fc69b9f7	Set a default zoom level that isn't the whole track	2017-10-12 22:19:02 +09:00
Dean Herbert	37b88d834e	Adjust padding slightly	2017-10-12 22:10:37 +09:00
smoogipoo	ab62390336	Make TimelineButtons combined take up the full height of the timeline	2017-10-12 18:32:39 +09:00
smoogipoo	a6901c0a27	Change TimelineButton icon colour to white when hovered	2017-10-12 18:17:36 +09:00
smoogipoo	5ccfc1918e	Hook up more bindables for hitobjects/hitsounds	2017-10-12 17:51:01 +09:00
smoogipoo	db672becbc	Implement waveform checkbox	2017-10-12 17:50:51 +09:00
smoogipoo	3c35a7a6ae	graph -> waveform	2017-10-12 17:37:40 +09:00
smoogipoo	4586877239	Implement magnification buttons	2017-10-12 17:31:21 +09:00
smoogipoo	de8f9325a3	Implement TimelineButton and use for the magnification buttons	2017-10-12 16:10:33 +09:00
smoogipoo	2844764e3c	Hit Objects/Hit Sounds -> Hitobjects/Hitsounds	2017-10-12 15:37:45 +09:00
smoogipoo	e12fa49436	Integrate timeline into Compose	2017-10-12 15:37:00 +09:00
smoogipoo	6fbf52c3eb	Remove unused usings	2017-10-12 15:32:18 +09:00
smoogipoo	1cf8c0284a	Re-namespace a few classes	2017-10-10 15:22:39 +09:00
smoogipoo	166194e6b6	Further logic simplification	2017-10-10 15:09:26 +09:00
smoogipoo	074a1db4a1	Implement scrolling and better zoom	2017-10-10 12:45:27 +09:00
smoogipoo	cb58a1371e	Merge branch 'editor-waveform' into editor-waveform-timeline ... # Conflicts: # osu.Game/osu.Game.csproj	2017-10-09 18:10:52 +09:00
smoogipoo	b97b575b27	Merge remote-tracking branch 'origin/master' into editor-waveform ... # Conflicts: # osu-framework	2017-10-09 17:20:24 +09:00
smoogipoo	19b38983df	Update in-line with framework	2017-10-09 17:18:11 +09:00
smoogipoo	10abaa866b	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00
smoogipoo	c0b394811f	Make compose mode the default ... Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.	2017-10-07 01:46:54 +09:00
smoogipoo	d432ab7510	Reorder screen tab control items	2017-10-07 01:44:20 +09:00
smoogipoo	38ae9d905e	Fix bindable binding to make the editor load a screen by default again	2017-10-07 01:42:45 +09:00
smoogipoo	837d1ba12e	Remove rounded corners on the editor menu bar	2017-10-07 01:38:13 +09:00
smoogipoo	a154ee3a89	Add File -> Exit to editor menu	2017-10-07 00:51:30 +09:00
smoogipoo	fc99860f4e	Remove EditorMenuBarItem	2017-10-07 00:51:20 +09:00
Dean Herbert	19c663da11	Remove scale effect on editor screen switches	2017-10-06 23:41:49 +08:00
smoogipoo	0a9d23b4ba	Update with framework changes (removal of WaveformDisplay)	2017-10-05 14:33:39 +09:00