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
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
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09: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
cf44868bcd
Give EditorScreen a Beatmap
2017-10-04 15:02:11 +09:00
7211dd2015
Remove unnecessary usings
2017-10-02 10:11:43 +09:00
69b61a62a5
Implement base Compose screen
2017-10-02 10:09:21 +09:00
af4c6276e4
Adjust transforms of EditorScreen
2017-10-02 10:09:10 +09:00
91cede79c2
Mask the editor screens
2017-10-02 10:07:34 +09:00
6018b4e5e4
Make EditorScreen a Container
2017-10-02 09:34:51 +09:00
2a310f02bc
modeContainer -> screenContainer
2017-10-02 09:27:27 +09:00
c2d63eb0bd
Add EditorScreen + screen changing functionality
2017-10-02 09:26:52 +09:00
221902f4fe
Restructure Editor construction
2017-10-02 09:26:16 +09:00
7b1ef53f36
Expose a mode change event from EditorMenuBar
2017-10-02 09:24:25 +09:00
8ed23a60e9
Remove items from the editor menu bar
2017-10-02 09:10:40 +09:00
21c6a63fa1
Use using for Description
2017-09-29 20:03:09 +09:00
7b4348254c
Don't use new
2017-09-29 20:02:55 +09:00
775e8bada5
Make the background bottom corners look nice with the new hover functionality
2017-09-29 15:13:38 +09:00
b2eab1f435
Set the hover background colour as dictated by flyte
2017-09-29 15:09:56 +09:00
6bb5210c7c
Remove the parentSizedBox
2017-09-29 15:09:28 +09:00
95364d0173
No more box background
2017-09-27 22:15:11 +09:00
ba8bf6cbd5
Add ScreenSelectionTabControl to EditorMenuBar
2017-09-27 22:01:53 +09:00
545c375199
Update design of EditorMenuBar to match flyte's design more closely
2017-09-27 22:01:03 +09:00