Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
7550b461e3
Add individual beatmap set lookup request
2017-10-13 19:57:59 +09:00
Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
Dean Herbert
f9a1240325
Merge remote-tracking branch 'upstream/master' into direct-previews
2017-10-13 14:06:46 +09:00
Dean Herbert
d98f1a2bb7
Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
2017-10-12 21:48:08 +09:00
Dean Herbert
182bb71eb0
Merge branch 'master' into editor-waveform
2017-10-12 20:49:48 +09:00
Dean Herbert
70c55b23f4
Remove references to CodeAnalysisRulesets
...
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
smoogipoo
622659336d
Merge + update framework
2017-10-12 17:02:39 +09:00
Thomas Müller
78f2037d84
Remove now obsolete RatioAdjust
2017-10-12 09:42:06 +02:00
smoogipoo
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
smoogipoo
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
smoogipoo
c2f3c0e6df
Add TestCaseIconButton to demonstrate IconButton usages
2017-10-10 18:32:09 +09:00
smoogipoo
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
smoogipoo
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
Jorolf
de2181b8f5
Merge branch 'master' of git://github.com/ppy/osu into direct-previews
2017-10-06 21:02:48 +02:00
Jorolf
5a8b8dacbb
move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton
2017-10-06 21:02:00 +02:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
smoogipoo
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
smoogipoo
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
smoogipoo
8bc20a2545
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 19:49:23 +09:00
smoogipoo
34eede0d04
Re-namespace EditorScreenMode
2017-10-04 19:36:55 +09:00
smoogipoo
357a467337
Implement design mode
2017-10-04 19:24:19 +09:00
smoogipoo
01c839eda7
Move WaveformDisplay into separate class and add some commenting
2017-10-04 17:51:28 +09:00
smoogipoo
1a7e3fa09e
Initial implementation of a test case which showcases waveforms
2017-10-04 17:51:27 +09:00
smoogipoo
69b61a62a5
Implement base Compose screen
2017-10-02 10:09:21 +09:00
smoogipoo
c2d63eb0bd
Add EditorScreen + screen changing functionality
2017-10-02 09:26:52 +09:00
smoogipoo
2a9edcbb4f
Add test case for the editor
2017-10-02 08:11:02 +09:00
EVAST9919
2f852d705e
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-01 23:10:49 +03: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
Dean Herbert
eed358a2c1
Merge branch 'master' into editor-screen-selection
2017-09-29 18:24:46 +08:00
EVAST9919
e7632b6e6f
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-28 14:44:31 +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
ba8bf6cbd5
Add ScreenSelectionTabControl to EditorMenuBar
2017-09-27 22:01:53 +09:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Jorolf
355a7b6649
Merge branch 'master' of git://github.com/ppy/osu into direct-previews
2017-09-26 12:22:11 +02:00
Dan Balasescu
b8b54e95a5
Merge branch 'master' into editor-timing-timeline
2017-09-26 15:54:01 +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
Dean Herbert
5be11f539b
Rename to BeatmapSetOverlay
2017-09-25 17:26:27 +08: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
b83596b44d
Merge branch 'master' into online-beatmap-set-overlay
2017-09-25 16:15:58 +08:00
EVAST9919
2da3ea00b6
Bind break overlay to accuracy
2017-09-23 16:42:18 +03:00
MrTheMake
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
EVAST9919
56bde64839
Add arrows overlay
2017-09-22 01:16:05 +03:00
