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
b1a2da58bc
Merge pull request #1339 from sunghwan2789/decoder-improve
...
Trim end of line
2017-10-08 19:07:04 +09:00
bd9f2db477
Trim line
2017-10-08 17:30:21 +09:00
6c5c734ff1
Trim end of line
...
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
c22e1520a0
Merge pull request #1337 from smoogipoo/editor-screens
...
Initial implementation of editor screens
2017-10-07 01:09:04 +08: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
3557737a18
Update framework
2017-10-06 23:20:56 +08:00
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
79fcfda10a
Merge pull request #1279 from EVAST9919/break_overlay_take_three
...
Initial implementation of the Break Overlay
2017-10-06 13:09:31 +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
7926757898
Remove unneeded parens
2017-10-05 14:33:49 +09:00
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
2bc8fe027b
Extend the testcase to test short breaks
2017-10-05 06:17:48 +03: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
e9bc5dbd0f
Include framework commits
2017-10-04 23:35:20 +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
80fb14e3dc
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-04 14:50:02 +03: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
a37b10d512
Make TestCaseWaveform use invalidations + remove some of the crud
2017-10-04 17:51:28 +09:00
3eeb36cbd4
Remove now unused class
2017-10-04 17:51:27 +09:00
319649f446
Make TestCaseWaveform use a custom drawnode instead of boxes
2017-10-04 17:51:27 +09:00
1a7e3fa09e
Initial implementation of a test case which showcases waveforms
2017-10-04 17:51:27 +09:00
cf44868bcd
Give EditorScreen a Beatmap
2017-10-04 15:02:11 +09:00
4930dfe87e
Merge pull request #1328 from EVAST9919/clickable_users
...
Show mapper's profile when clicking on avatar in BeatmapSetOverlay
2017-10-04 12:12:02 +08:00
