RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,446 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

101 Commits

Author SHA1 Message Date
EVAST9919 d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
smoogipoo cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
Dean Herbert 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
smoogipoo 04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
Dean Herbert 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
Dean Herbert c0d64bf409 Use Gray instead of FromHex for grays 2017-10-12 22:19:29 +09:00
Dean Herbert 37fc69b9f7 Set a default zoom level that isn't the whole track 2017-10-12 22:19:02 +09:00
Dean Herbert 37b88d834e Adjust padding slightly 2017-10-12 22:10:37 +09:00
smoogipoo ab62390336 Make TimelineButtons combined take up the full height of the timeline 2017-10-12 18:32:39 +09:00
smoogipoo a6901c0a27 Change TimelineButton icon colour to white when hovered 2017-10-12 18:17:36 +09:00
smoogipoo 5ccfc1918e Hook up more bindables for hitobjects/hitsounds 2017-10-12 17:51:01 +09:00
smoogipoo db672becbc Implement waveform checkbox 2017-10-12 17:50:51 +09:00
smoogipoo 3c35a7a6ae graph -> waveform 2017-10-12 17:37:40 +09:00
smoogipoo 4586877239 Implement magnification buttons 2017-10-12 17:31:21 +09:00
smoogipoo de8f9325a3 Implement TimelineButton and use for the magnification buttons 2017-10-12 16:10:33 +09:00
smoogipoo 2844764e3c Hit Objects/Hit Sounds -> Hitobjects/Hitsounds 2017-10-12 15:37:45 +09:00
smoogipoo e12fa49436 Integrate timeline into Compose 2017-10-12 15:37:00 +09:00
smoogipoo 6fbf52c3eb Remove unused usings 2017-10-12 15:32:18 +09:00
smoogipoo 1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
smoogipoo 166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
smoogipoo 074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
smoogipoo cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline 
# Conflicts:
#	osu.Game/osu.Game.csproj
 2017-10-09 18:10:52 +09:00
smoogipoo b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform 
# Conflicts:
#	osu-framework
 2017-10-09 17:20:24 +09:00
smoogipoo 19b38983df Update in-line with framework 2017-10-09 17:18:11 +09: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 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
smoogipoo 0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +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
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
smoogipoo 80e984f72d Update in-line with framework 2017-10-04 18:55:38 +09:00
smoogipoo 01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +09:00
smoogipoo cf44868bcd Give EditorScreen a Beatmap 2017-10-04 15:02:11 +09:00
smoogipoo 7211dd2015 Remove unnecessary usings 2017-10-02 10:11:43 +09:00
smoogipoo 69b61a62a5 Implement base Compose screen 2017-10-02 10:09:21 +09:00
smoogipoo af4c6276e4 Adjust transforms of EditorScreen 2017-10-02 10:09:10 +09:00