Commit Graph

209 Commits

Author SHA1 Message Date
4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00
07e0aba01c Remove using 2017-11-17 14:10:13 +03:00
1680c0905f Fix track tempo could be less than 1 on exiting the editor 2017-11-17 14:02:07 +03:00
cc04d5bc61 Add all the objects to the PlaybackContainer 2017-11-17 13:35:41 +03:00
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
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
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