1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-19 16:12:53 +08:00
Commit Graph

156 Commits

Author SHA1 Message Date
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks 2018-03-19 19:06:38 +09:00
smoogipoo
8d4c9eda48 Fix attempting to add selection boxes with no selection
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
smoogipoo
e25d1f6982 Pass down editor clocks through DI 2018-03-19 16:27:52 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks 2018-03-16 23:32:54 +09:00
smoogipoo
d05947ef48 Pass adjustable clocks to components, rather than relying on the track 2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b Move clock construction to Editor 2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466 Move editor constructions to BDL load 2018-03-15 17:10:08 +09:00
Dean Herbert
81f82d98a1 Rework a lot of naming and structure 2018-03-14 15:18:21 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
Dean Herbert
ae9f08f387 Fix crash in editor when trying to seek on a virtual track 2017-12-27 11:47:04 +09:00
Dean Herbert
71a94d6b44 Add a bindable Enabled flag to NotificationManager
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
smoogipoo
2fb8895e66 Add spacer to menu 2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa Remove migration setting in favour of export option in the editor 2017-12-21 19:56:12 +09:00
Dean Herbert
7957e55710
Merge branch 'master' into editor-composer 2017-12-03 14:47:07 +09:00
smoogipoo
2852337b04 Remove unused using 2017-12-02 20:35:47 +09:00
smoogipoo
cd20d6df16 Apply suggested changes 2017-12-02 20:31:15 +09:00
smoogipoo
c14d68e685 Use OsuColour for radio buttons 2017-12-02 20:30:18 +09:00
smoogipoo
5be00cb0ec Add todo 2017-12-01 18:40:55 +09:00
smoogipoo
0b95e36675 Fix RelativeChildSize error temporarily 2017-12-01 18:00:20 +09:00
smoogipoo
89772f4efd A few resharper fixes 2017-11-30 19:54:58 +09:00
smoogipoo
e9cbef88f1 Improve selection/deselection behaviour of RadioButtonCollections 2017-11-30 19:50:07 +09:00
smoogipoo
efa39f38ca CI fixes 2017-11-30 18:49:08 +09:00
smoogipoo
e5353bb53e Add border to playfield, add shadow to toolbox buttons 2017-11-30 17:38:55 +09:00
smoogipoo
456bbe25f3 Implement toolbox into HitObjectComposer 2017-11-30 16:58:14 +09:00
smoogipoo
73e41f9dde Add constructors to RadioButton 2017-11-30 16:57:30 +09:00
smoogipoo
ead7456978 Add compose radio buttons + testcase 2017-11-30 15:43:19 +09:00
smoogipoo
abd6125691 Make sure that composerContainer is cleared for testing purposes 2017-11-30 14:00:17 +09:00
smoogipoo
a7a9569aee Don't exit when we don't have composer for now 2017-11-30 13:53:57 +09:00
smoogipoo
ee35422efc Handle rulesets that don't support composition a bit better 2017-11-29 18:38:12 +09:00
smoogipoo
309eb4edd7 Integrate HitObjectComposer into Compose
Also removes the other rulesets' HitObjectComposers for now.
2017-11-29 17:46:21 +09:00
smoogipoo
f586cbac32 Restructure Compose to use grids and eventually support HitObjectContainer 2017-11-29 16:47:52 +09:00
Dean Herbert
36d45f633d Reorder methods 2017-11-22 11:57:09 +09:00
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