6053 Commits

Author	SHA1	Message	Date
Jorolf	59247bcf1e	another unused using	2017-09-29 23:31:42 +02:00
Jorolf	2457df8e18	remove unused usings and reset the track to the start when playing again	2017-09-29 23:26:16 +02:00
Jorolf	26e7a3f157	add license header	2017-09-29 23:12:12 +02:00
Jorolf	259d49e6b9	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-09-29 23:09:33 +02:00
Jorolf	647304c14b	move logic to DirectPanel and reuse stuff for the PreviewButton	2017-09-29 23:08:30 +02: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
Dan Balasescu	61bf19bbab	Merge branch 'master' into context_menu_test_fix	2017-09-28 22:58:15 +09:00
EVAST9919	e7632b6e6f	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-28 14:44:31 +03:00
EVAST9919	ca1f96208a	Fix TestCaseContextMenu not being updated inline with previous changes	2017-09-28 14:31:02 +03:00
EVAST9919	75cd6eeb1c	Clean up Wave in WaveOverlayContainer	2017-09-28 14:20:19 +03: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
Dan Balasescu	5dceee2e36	Merge branch 'master' into fix-invisible-marker	2017-09-27 14:53:58 +09:00
Dan Balasescu	9c14d3b696	Merge branch 'master' into api-state-fixes	2017-09-27 14:41:25 +09:00
Dean Herbert	e81d9cb5fc	Merge branch 'master' into fix-login-overlay	2017-09-27 13:17:46 +08:00
Dan Balasescu	43d56bc9d7	Merge branch 'master' into fix-invisible-marker	2017-09-27 14:17:42 +09:00
Dean Herbert	a17cc04cde	Make APIAccess's state only privately settable	2017-09-27 13:16:17 +08:00
Dean Herbert	4a95d64239	Fix yellow line in login overlay not following size correctly ... Also allows right click context menu to correctly extrude beyond the local masking.	2017-09-27 13:06:57 +08:00
Dan Balasescu	67481a1e6a	Merge branch 'master' into api-state-fixes	2017-09-27 14:02:19 +09:00
Dan Balasescu	4881d01b7e	Merge branch 'master' into close-beatmap-overlay	2017-09-27 13:51:13 +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	ec50834e98	Load osu!direct overlay to "newest maps" tab by default	2017-09-27 12:23:48 +08:00
Dean Herbert	05c6829deb	Move all APIAccess State changes to the local thread ... Previously changes to the state were triggering events like Logout, which could get things into a bad state.	2017-09-27 12:18:24 +08:00
Dean Herbert	3018d32b13	Close BeatmapSetOverlay when clicking outside of it	2017-09-27 11:22:47 +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
EVAST9919	c696f74578	Fix broken testcase and apply suggested changes	2017-09-27 01:10:48 +03:00
EVAST9919	3cd6319ffa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-27 00:32:38 +03: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
Jorolf	355a7b6649	Merge branch 'master' of git://github.com/ppy/osu into direct-previews	2017-09-26 12:22:11 +02:00
Jorolf	1f2a82b7ab	make PreviewPlaying readonly instead of abstract	2017-09-26 12:21:00 +02: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	40f597f762	Add download button to grid view panels	2017-09-26 00:18:35 +08:00