446 Commits

Author	SHA1	Message	Date
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
smoogipoo	dcd5cc6753	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-04 22:00:44 +09:00
smoogipoo	8427bb44d1	Implement basic layout for the compose screen ScrollableTimeline	2017-10-04 22:00:42 +09:00
smoogipoo	ea45452993	Allow resolution > 1	2017-10-04 21:57:46 +09:00
smoogipoo	1377f73b46	Multiply resolution before clamping	2017-10-04 21:57:29 +09:00
smoogipoo	8bc20a2545	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-04 19:49:23 +09:00
smoogipoo	8a52fdc8fa	Use a bindable for the current screen in EditorMenuBar ... Replaces the current Action.	2017-10-04 19:37:17 +09:00
smoogipoo	34eede0d04	Re-namespace EditorScreenMode	2017-10-04 19:36:55 +09:00
smoogipoo	e2824d4732	Reduce harshness of scale for now ... Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...	2017-10-04 19:26:26 +09:00
smoogipoo	357a467337	Implement design mode	2017-10-04 19:24:19 +09:00
smoogipoo	5ca4a2d2c8	Add some nullchecks to WaveformDisplay	2017-10-04 19:09:39 +09:00
smoogipoo	81960c7b48	CI fixes	2017-10-04 19:03:02 +09:00
smoogipoo	80e984f72d	Update in-line with framework	2017-10-04 18:55:38 +09:00
smoogipoo	01c839eda7	Move WaveformDisplay into separate class and add some commenting	2017-10-04 17:51:28 +09:00
smoogipoo	cf44868bcd	Give EditorScreen a Beatmap	2017-10-04 15:02:11 +09:00
smoogipoo	7211dd2015	Remove unnecessary usings	2017-10-02 10:11:43 +09:00
smoogipoo	69b61a62a5	Implement base Compose screen	2017-10-02 10:09:21 +09:00
smoogipoo	af4c6276e4	Adjust transforms of EditorScreen	2017-10-02 10:09:10 +09:00
smoogipoo	91cede79c2	Mask the editor screens	2017-10-02 10:07:34 +09:00
smoogipoo	6018b4e5e4	Make EditorScreen a Container	2017-10-02 09:34:51 +09:00
smoogipoo	2a310f02bc	modeContainer -> screenContainer	2017-10-02 09:27:27 +09:00
smoogipoo	c2d63eb0bd	Add EditorScreen + screen changing functionality	2017-10-02 09:26:52 +09:00
smoogipoo	221902f4fe	Restructure Editor construction	2017-10-02 09:26:16 +09:00
smoogipoo	7b1ef53f36	Expose a mode change event from EditorMenuBar	2017-10-02 09:24:25 +09:00
smoogipoo	8ed23a60e9	Remove items from the editor menu bar	2017-10-02 09:10:40 +09:00
smoogipoo	21c6a63fa1	Use using for Description	2017-09-29 20:03:09 +09:00
smoogipoo	7b4348254c	Don't use new	2017-09-29 20:02:55 +09:00
smoogipoo	775e8bada5	Make the background bottom corners look nice with the new hover functionality	2017-09-29 15:13:38 +09:00
smoogipoo	b2eab1f435	Set the hover background colour as dictated by flyte	2017-09-29 15:09:56 +09:00
smoogipoo	6bb5210c7c	Remove the parentSizedBox	2017-09-29 15:09:28 +09:00
smoogipoo	95364d0173	No more box background	2017-09-27 22:15:11 +09:00
smoogipoo	ba8bf6cbd5	Add ScreenSelectionTabControl to EditorMenuBar	2017-09-27 22:01:53 +09:00
smoogipoo	545c375199	Update design of EditorMenuBar to match flyte's design more closely	2017-09-27 22:01:03 +09:00
Dean Herbert	e64860ad45	Fix test case not working as expected	2017-09-27 12:46:34 +08:00
Dean Herbert	faad3fc7d3	Arbitrarily move colour assignment	2017-09-27 12:40:32 +08:00
Dean Herbert	d5ed218488	Fix timeline sizes being updated potentially before the track has a length	2017-09-27 11:07:43 +08:00
Dean Herbert	7ad21d9a6d	Simplify marker part construction	2017-09-27 11:07:23 +08:00
Dean Herbert	eae29820c0	Fix marker being cleared each beatmap change	2017-09-27 11:07:17 +08:00
Dean Herbert	708632bca8	Remove second unnecessary colour set	2017-09-27 10:06:36 +08:00
smoogipoo	10dbd68c1e	Simplify null check	2017-09-26 20:11:45 +09:00
smoogipoo	c578509a20	Bind to the screen Beatmap instead of the game-wide Beatmap	2017-09-26 17:58:40 +09:00
smoogipoo	3937ebdc3d	Add missing license headers	2017-09-26 15:58:30 +09:00
smoogipoo	10e5fe40b2	A bit of cleanup	2017-09-26 15:51:45 +09:00
smoogipoo	5953c1084e	Re-namespace SummaryTimeline	2017-09-26 15:45:27 +09:00
smoogipoo	85cb541fef	Implement MarkerPart for the marker	2017-09-26 15:45:08 +09:00
smoogipoo	a1f88a17b1	Re-namespace and split out timeline parts from the SummaryTimeline	2017-09-26 15:44:40 +09:00
smoogipoo	d787c740fa	Fix bookmarks not working ... We should be dealing with the array in every situation, with the exception of the database.	2017-09-25 17:46:51 +09:00
smoogipooo	e65a17ad96	Remove redundant usings	2017-09-20 18:40:41 +09:00
smoogipooo	7168e8fd99	Improve layout of bottom bar in the Editor	2017-09-20 18:16:03 +09:00
smoogipooo	7588f1b6ca	Add SummaryTimeline to Editor	2017-09-20 17:09:38 +09:00
smoogipooo	f9568619e7	Move SummaryTimeline into /Edit/Components/SummaryTimeline	2017-09-20 16:59:03 +09:00
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +09:00
Dean Herbert	41398f57d6	Changes in line with framework	2017-09-07 20:36:32 +09:00
smoogipooo	06fac913bf	Re-implement EditorMenuBar.	2017-09-06 21:14:29 +09:00
smoogipooo	b17d9ac06e	Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.	2017-08-28 17:55:50 +09:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
Dean Herbert	d0dea33faa	Make Beatmap (bindable) non-nullable.	2017-07-19 15:16:53 +09:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Dean Herbert	64682a741c	Update framework	2017-06-08 17:05:25 +09:00
Huo Yaoyuan	8c991eae01	Fix CI issues.	2017-03-14 22:27:24 +08:00
Huo Yaoyuan	b2dd9afcf3	Update editor workflow and make edit button works.	2017-03-14 22:18:40 +08:00
Huo Yaoyuan	259d39c6ad	Stop playing the track in editor ... to avoid unused member warning	2017-03-14 21:28:33 +08:00
Huo Yaoyuan	f97e8ae97f	Fix typo and warnings.	2017-03-14 21:20:38 +08:00
Huo Yaoyuan	618e8e822b	Implement EditSongSelect and MatchSongSelect.	2017-03-14 19:53:20 +08:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Thomas Müller	c6d688898f	Initial implementation of a beatmap carousell and various minor improvements to song select. ... No big optimizations yet, but groundwork is laid out.	2016-11-20 20:34:16 +01:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00