1580 Commits

Author	SHA1	Message	Date
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
Dean Herbert	eed358a2c1	Merge branch 'master' into editor-screen-selection	2017-09-29 18:24:46 +08: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
Dean Herbert	4eaf6b4b94	Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll	2017-09-28 00:14:04 +08: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
Dean Herbert	7c70d3d2cb	Merge branch 'master' into storyboard_integration	2017-09-26 20:19:26 +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
Dan Balasescu	b8b54e95a5	Merge branch 'master' into editor-timing-timeline	2017-09-26 15:54:01 +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
Dean Herbert	f129902ee0	Avoid nullrefs when data is not present	2017-09-25 23:35:02 +08:00
Damnae	2d4616fd43	Apply beatmap settings when creating the DrawableStoryboard.	2017-09-25 11:03:57 +02: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
Damnae	0996867112	Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.	2017-09-25 10:40:22 +02:00
smoogipoo	7fb8008e44	Merge remote-tracking branch 'origin/master' into editor-timing-timeline ... # Conflicts: # osu-framework	2017-09-25 17:20:55 +09:00
Dean Herbert	0aebfdd578	Merge branch 'master' into icons_jumping_fix	2017-09-25 12:07:25 +08:00
Huo Yaoyuan	442259d9e0	Fix overlay toggling in song select.	2017-09-23 19:47:23 +08: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	120446e4a7	Ensure only one dialog is being displayed by the SongSelect footer at a time ... Fixes #1208	2017-09-20 14:32:15 +09:00
Damnae	fcaabf7fdf	Merge branch 'master' into storyboard_integration	2017-09-19 17:36:29 +02:00
EVAST9919	1de8bca7f6	Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix	2017-09-19 17:08:32 +03:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
Dan Balasescu	02ccea1c4e	Merge branch 'master' into scores-lookup-requires-id	2017-09-16 08:43:59 +09:00
Damnae	757a159516	Display a non-parallax background at the appropriate size when storyboards do not replace it.	2017-09-15 14:31:54 +02:00
Damnae	f5368505ab	Load the storyboard asynchronously if it wasn't loaded with the beatmap.	2017-09-15 11:58:37 +02:00
Damnae	4a15762139	Don't create drawables for hidden storyboards.	2017-09-15 11:58:37 +02:00
Damnae	c8cdf6787e	Better property name.	2017-09-15 11:58:31 +02:00
Damnae	7c3ce7e830	Unbind events affecting the background after gameplay has ended.	2017-09-15 09:16:56 +02:00
Damnae	cb8029af9e	Add a setting to hide storyboards.	2017-09-15 09:16:56 +02:00
Damnae	ddaf28d7f6	Integrate storyboards with gameplay.	2017-09-15 09:16:56 +02:00
Damnae	010a6ec252	Fix player loading.	2017-09-15 09:06:27 +02:00