Commit Graph

1058 Commits

Author SHA1 Message Date
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
259d49e6b9 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-29 23:09:33 +02:00
647304c14b move logic to DirectPanel and reuse stuff for the PreviewButton 2017-09-29 23:08:30 +02: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
355a7b6649 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-26 12:22:11 +02: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
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02: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
5b90f45691 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-09-19 21:26:05 +02:00
ce4a44000f Merge branch 'master' into direct-previews 2017-09-19 19:25:41 +02: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
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00
be1e868a2a add previews to osu!direct 2017-09-17 22:39:34 +02:00
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
98b847b025 Add API retrieval support 2017-09-14 20:08:07 +09:00
9c4876d135 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-14 18:52:44 +09: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
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
bab3ef0669 Rename storyboard classes. 2017-09-13 11:22:24 +02:00
08b5d4e16c Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-12 21:26:06 -03:00
28a25c201f Merge remote-tracking branch 'upstream/master' into ranks-section 2017-09-12 19:50:58 +09:00
47cd1d486b Merge branch 'master' into storyboards 2017-09-11 12:29:19 +02:00
43fa314fe0 Details and more data displaying. 2017-09-11 02:48:48 -03:00