c0d64bf409
Use Gray instead of FromHex for grays
2017-10-12 22:19:29 +09:00
37fc69b9f7
Set a default zoom level that isn't the whole track
2017-10-12 22:19:02 +09:00
37b88d834e
Adjust padding slightly
2017-10-12 22:10:37 +09:00
ab62390336
Make TimelineButtons combined take up the full height of the timeline
2017-10-12 18:32:39 +09:00
a6901c0a27
Change TimelineButton icon colour to white when hovered
2017-10-12 18:17:36 +09:00
5ccfc1918e
Hook up more bindables for hitobjects/hitsounds
2017-10-12 17:51:01 +09:00
db672becbc
Implement waveform checkbox
2017-10-12 17:50:51 +09:00
3c35a7a6ae
graph -> waveform
2017-10-12 17:37:40 +09:00
4586877239
Implement magnification buttons
2017-10-12 17:31:21 +09:00
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
2844764e3c
Hit Objects/Hit Sounds -> Hitobjects/Hitsounds
2017-10-12 15:37:45 +09:00
e12fa49436
Integrate timeline into Compose
2017-10-12 15:37:00 +09:00
6fbf52c3eb
Remove unused usings
2017-10-12 15:32:18 +09:00
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
166194e6b6
Further logic simplification
2017-10-10 15:09:26 +09:00
074a1db4a1
Implement scrolling and better zoom
2017-10-10 12:45:27 +09:00
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
c0b394811f
Make compose mode the default
...
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
5caca1d328
Don't use '#' in RankDisplay for now
2017-10-05 05:27:52 +03:00
cb0dbc6d9e
Fix shrinking bar lingering on the screen for too long
2017-10-05 05:23:18 +03:00
cc99678a96
Remove useless usings
2017-10-05 05:09:23 +03:00
20bf0502ab
Use scheduling rather than raw transform delays
2017-10-05 10:03:48 +08:00
22a59d753b
Make all the overlays IStateful
2017-10-05 04:38:13 +03:00
dcd5cc6753
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 22:00:44 +09:00
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
ea45452993
Allow resolution > 1
2017-10-04 21:57:46 +09:00
1377f73b46
Multiply resolution before clamping
2017-10-04 21:57:29 +09:00
8bc20a2545
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 19:49:23 +09:00
8a52fdc8fa
Use a bindable for the current screen in EditorMenuBar
...
Replaces the current Action.
2017-10-04 19:37:17 +09:00
34eede0d04
Re-namespace EditorScreenMode
2017-10-04 19:36:55 +09:00
e2824d4732
Reduce harshness of scale for now
...
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
357a467337
Implement design mode
2017-10-04 19:24:19 +09:00
5ca4a2d2c8
Add some nullchecks to WaveformDisplay
2017-10-04 19:09:39 +09:00
81960c7b48
CI fixes
2017-10-04 19:03:02 +09:00
80e984f72d
Update in-line with framework
2017-10-04 18:55:38 +09:00
01c839eda7
Move WaveformDisplay into separate class and add some commenting
2017-10-04 17:51:28 +09:00
