Huo Yaoyuan
a876ab9b90
Move spm counter to a seperated control.
2017-10-07 15:31:42 +08:00
Jorolf
f3ca6cc387
remove redundant stuff
2017-10-06 22:02:33 +02: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
Dean Herbert
3b6596b609
Merge branch 'master' into spm-counter
2017-10-07 01:10:57 +08:00
Dean Herbert
c22e1520a0
Merge pull request #1337 from smoogipoo/editor-screens
...
Initial implementation of editor screens
2017-10-07 01:09:04 +08:00
smoogipoo
10abaa866b
Put screens below the top and bottom bars of the editor
2017-10-07 01:56:11 +09:00
smoogipoo
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
smoogipoo
d432ab7510
Reorder screen tab control items
2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e
Fix bindable binding to make the editor load a screen by default again
2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e
Remove rounded corners on the editor menu bar
2017-10-07 01:38:13 +09:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89
Add File -> Exit to editor menu
2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e
Remove EditorMenuBarItem
2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11
Remove scale effect on editor screen switches
2017-10-06 23:41:49 +08:00
Dean Herbert
3557737a18
Update framework
2017-10-06 23:20:56 +08:00
Dean Herbert
55267abe67
Merge branch 'master' into editor-screens
2017-10-06 23:19:16 +08:00
Huo Yaoyuan
404c4917dc
Use single queue for spinning record.
2017-10-06 20:42:24 +08:00
Dean Herbert
54a98a74bc
Merge branch 'master' into spm-counter
2017-10-06 16:03:02 +08:00
Dean Herbert
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
EVAST9919
95ac4e9265
Remove useless using
2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb
Apply suggested shrinking bar changes
2017-10-06 04:49:16 +03:00
TocoToucan
887aa7496b
Rework EF Core usage in model classes
2017-10-06 00:23:26 +03:00
Huo Yaoyuan
29f9c8143d
Use RotationAbsolute to calculate spm.
2017-10-05 20:08:45 +08:00
Huo Yaoyuan
ee8746b848
Fade in spm texts.
2017-10-05 20:07:33 +08:00
Huo Yaoyuan
24187cc53a
Move spm text out of scaled parts.
2017-10-05 19:55:20 +08:00
Huo Yaoyuan
0da66cfc7c
Merge branch 'master' into spm-counter
2017-10-05 19:29:50 +08:00
Huo Yaoyuan
134e1299bb
Update spm value when spinner not active.
2017-10-05 19:23:58 +08:00
smoogipoo
7926757898
Remove unneeded parens
2017-10-05 14:33:49 +09:00
smoogipoo
0a9d23b4ba
Update with framework changes (removal of WaveformDisplay)
2017-10-05 14:33:39 +09:00
EVAST9919
2bc8fe027b
Extend the testcase to test short breaks
2017-10-05 06:17:48 +03:00
EVAST9919
5caca1d328
Don't use '#' in RankDisplay for now
2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e
Fix shrinking bar lingering on the screen for too long
2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96
Remove useless usings
2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab
Use scheduling rather than raw transform delays
2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b
Make all the overlays IStateful
2017-10-05 04:38:13 +03:00
TocoToucan
6a4198d0d6
Initial EF Core commit
2017-10-04 22:52:12 +03:00
smoogipoo
e9bc5dbd0f
Include framework commits
2017-10-04 23:35:20 +09:00
smoogipoo
dcd5cc6753
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1
Implement basic layout for the compose screen ScrollableTimeline
2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993
Allow resolution > 1
2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46
Multiply resolution before clamping
2017-10-04 21:57:29 +09:00
EVAST9919
80fb14e3dc
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-04 14:50:02 +03:00
smoogipoo
8bc20a2545
Merge branch 'editor-waveform' into editor-waveform-timeline
2017-10-04 19:49:23 +09:00
smoogipoo
8a52fdc8fa
Use a bindable for the current screen in EditorMenuBar
...
Replaces the current Action.
2017-10-04 19:37:17 +09:00
smoogipoo
34eede0d04
Re-namespace EditorScreenMode
2017-10-04 19:36:55 +09:00
smoogipoo
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
smoogipoo
357a467337
Implement design mode
2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8
Add some nullchecks to WaveformDisplay
2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48
CI fixes
2017-10-04 19:03:02 +09:00