Commit Graph

754 Commits

Author SHA1 Message Date
182bb71eb0 Merge branch 'master' into editor-waveform 2017-10-12 20:49:48 +09:00
70c55b23f4 Remove references to CodeAnalysisRulesets
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
622659336d Merge + update framework 2017-10-12 17:02:39 +09:00
78f2037d84 Remove now obsolete RatioAdjust 2017-10-12 09:42:06 +02:00
c2f3c0e6df Add TestCaseIconButton to demonstrate IconButton usages 2017-10-10 18:32:09 +09:00
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +09:00
1a7e3fa09e Initial implementation of a test case which showcases waveforms 2017-10-04 17:51:27 +09:00
69b61a62a5 Implement base Compose screen 2017-10-02 10:09:21 +09:00
c2d63eb0bd Add EditorScreen + screen changing functionality 2017-10-02 09:26:52 +09:00
2a9edcbb4f Add test case for the editor 2017-10-02 08:11:02 +09:00
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
eed358a2c1 Merge branch 'master' into editor-screen-selection 2017-09-29 18:24:46 +08:00
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
40f597f762 Add download button to grid view panels 2017-09-26 00:18:35 +08:00
5be11f539b Rename to BeatmapSetOverlay 2017-09-25 17:26:27 +08:00
7fb8008e44 Merge remote-tracking branch 'origin/master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-25 17:20:55 +09:00
b83596b44d Merge branch 'master' into online-beatmap-set-overlay 2017-09-25 16:15:58 +08:00
2da3ea00b6 Bind break overlay to accuracy 2017-09-23 16:42:18 +03:00
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
56bde64839 Add arrows overlay 2017-09-22 01:16:05 +03:00
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
c79568135a Add arrows 2017-09-21 01:44:30 +03:00
18a714df74 Move every class to it's own file 2017-09-20 22:33:07 +03:00
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
5978668d2b Mini -> Summary 2017-09-20 16:48:30 +09:00
fd278256ad EditorTimingTimeline -> EditorMiniTimeline 2017-09-20 15:50:32 +09:00
4cf88c72bf Move testcase to the correct project 2017-09-19 17:37:34 +03:00
c59d398aa5 Fix includes 2017-09-19 17:26:17 +03:00
1b0ab414fa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-19 17:23:10 +03:00
67d3861226 Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
511874389a Define trace for VisualTests 2017-09-19 16:07:00 +09:00
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
02fa9eeb3b Merge branch 'master' into online-beatmap-set-overlay 2017-09-14 16:52:44 +09:00
33d33a49ae Merge branch 'master' into storyboards 2017-09-14 16:06:19 +09:00