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

122 Commits

Author SHA1 Message Date
Dean Herbert e3c5a599b6 Tidy some regressions 2017-11-22 11:36:29 +09:00
Dean Herbert 27fb598352 Update colours to match design 2017-11-22 11:34:54 +09:00
Dean Herbert 0f8499c580 Rename to PlaybackControl and add a TestCase 2017-11-22 11:22:46 +09:00
Dean Herbert ff5404e57f Remove need for AlwaysPresent 
Also self-contains the tab options inside the tab control.
 2017-11-22 11:21:48 +09:00
Dean Herbert 855acc9401 Fix leading space before percent sign 2017-11-22 11:17:10 +09:00
Dean Herbert c06d6d0bbb Rename weird method 2017-11-22 10:59:31 +09:00
Dean Herbert 461c8e8be0 Clean up state change logic 2017-11-22 10:55:06 +09:00
Dean Herbert 63d366ea4b Bindables should be readonly 2017-11-22 10:54:33 +09:00
EVAST9919 41498ffad3 Apply suggestions 2017-11-21 12:22:19 +03:00
smoogipoo 0d1b5ae44f Adjust bottom bar sizing as suggested 2017-11-21 17:51:07 +09:00
smoogipoo 238756ec5d Merge remote-tracking branch 'origin/master' into editor-playback-speed 2017-11-21 17:41:16 +09:00
Dean Herbert 4f6263ef86 Make many internal classes and methods public 
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
 2017-11-21 12:06:16 +09:00
EVAST9919 ecc2877be6 Fix possible null and adjust timeline width 2017-11-20 09:29:26 +03:00
EVAST9919 4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
EVAST9919 34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
EVAST9919 58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
EVAST9919 0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
EVAST9919 7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00
EVAST9919 07e0aba01c Remove using 2017-11-17 14:10:13 +03:00
EVAST9919 1680c0905f Fix track tempo could be less than 1 on exiting the editor 2017-11-17 14:02:07 +03:00
EVAST9919 cc04d5bc61 Add all the objects to the PlaybackContainer 2017-11-17 13:35:41 +03:00
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