116 Commits

Author	SHA1	Message	Date
Dean Herbert	699f661b02	Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix	2018-05-25 19:07:30 +09:00
smoogipoo	f1ac84d95b	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
Aergwyn	b7e3ea348b	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
Aergwyn	1482bca147	Rename for better understanding ... ShowOverlays -> AllowOverlays ShowOverlaysOnEnter -> HideOverlaysOnEnter	2018-05-21 09:42:29 +02: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	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
smoogipoo	a2484fbf56	Move back to DI-ing adjustable clock into SummaryTimeline	2018-04-12 13:37:02 +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
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
smoogipoo	e25d1f6982	Pass down editor clocks through DI	2018-03-19 16:27:52 +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	37d393bca0	Update licence headers	2018-01-05 20:21:19 +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
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	0f8499c580	Rename to PlaybackControl and add a TestCase	2017-11-22 11:22:46 +09:00
smoogipoo	0d1b5ae44f	Adjust bottom bar sizing as suggested	2017-11-21 17:51:07 +09:00
EVAST9919	ecc2877be6	Fix possible null and adjust timeline width	2017-11-20 09:29:26 +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
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
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
smoogipoo	10abaa866b	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00
smoogipoo	a154ee3a89	Add File -> Exit to editor menu	2017-10-07 00:51:30 +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	357a467337	Implement design mode	2017-10-04 19:24:19 +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	91cede79c2	Mask the editor screens	2017-10-02 10:07:34 +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	8ed23a60e9	Remove items from the editor menu bar	2017-10-02 09:10:40 +09:00
smoogipoo	545c375199	Update design of EditorMenuBar to match flyte's design more closely	2017-09-27 22:01:03 +09:00
smoogipoo	c578509a20	Bind to the screen Beatmap instead of the game-wide Beatmap	2017-09-26 17:58:40 +09:00
smoogipoo	5953c1084e	Re-namespace SummaryTimeline	2017-09-26 15:45:27 +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
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +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
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00