1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 23:27:25 +08:00
Commit Graph

51838 Commits

Author SHA1 Message Date
Bartłomiej Dach
6558b4a175
Merge pull request #18412 from peppy/editor-menu-new-design
Update editor menu area to new design language
2022-05-25 19:26:24 +02:00
Dean Herbert
91834f0319 Fix missing colour dependency in menu bar test scene 2022-05-25 22:56:47 +09:00
Dean Herbert
463b8130c8 Update editor screen switcher to match new design language 2022-05-25 22:31:27 +09:00
Dean Herbert
206f2ca208 Rename screen switcher control to be in line with naming expectations 2022-05-25 22:20:33 +09:00
Dean Herbert
c4cae7f677 Update EditorMenuBar to match new design language 2022-05-25 22:19:24 +09:00
Dan Balasescu
fb22801afb
Merge pull request #18388 from peppy/editor-timing-waveforms
Add waveform comparison view to editor timing screen
2022-05-25 20:15:25 +09:00
Dean Herbert
795c9fcbc9 Update framework 2022-05-25 19:38:50 +09:00
Dan Balasescu
4545797c88
Merge pull request #18410 from peppy/add-announce-channel-type
Fix chat not working if user is joined to new "announcement" channel
2022-05-25 19:34:32 +09:00
Dean Herbert
f1d4902be5 Remove unnecessary bindable cast 2022-05-25 19:25:23 +09:00
Dean Herbert
87959a59d9 Add missing "announce" channel type
Of note, this doesn't mean the channels will display, but it does fix
parsing errors which cause the whole chat display to fail.
2022-05-25 18:28:33 +09:00
Dan Balasescu
79c8752bb4
Merge pull request #18408 from peppy/first-run-ui-scale-first
Move UI scale setup to the beginning of the first run setup
2022-05-25 12:56:03 +09:00
Dan Balasescu
e5db8a6de3
Merge pull request #18396 from peppy/editor-tidy-up
Bring editor design metrics up-to-date
2022-05-25 12:24:05 +09:00
Dean Herbert
de5d2df100 Move UI scale setup to the beginning of the first run setup 2022-05-25 12:19:26 +09:00
Dan Balasescu
f468d1eb16
Merge branch 'master' into editor-tidy-up 2022-05-25 11:58:34 +09:00
Dan Balasescu
8ca6f21dac
Merge pull request #18393 from peppy/editor-beat-divisor-size-static
Update beat snap divisor control to be more in line with new designs
2022-05-25 10:17:35 +09:00
Bartłomiej Dach
5f6baaca13
Merge branch 'master' into editor-beat-divisor-size-static 2022-05-24 23:17:02 +02:00
Bartłomiej Dach
c33aee17b0
Cache some more OverlayColourProviders to fix tests 2022-05-24 23:14:28 +02:00
Bartłomiej Dach
0d7792da50
Merge pull request #18391 from peppy/rounded-button-colour-default
Move `OverlayColourProvider` provisioning of `RoundedButton` to `SettingsButton` for now
2022-05-24 23:13:39 +02:00
Bartłomiej Dach
61c093c109
Merge branch 'master' into rounded-button-colour-default 2022-05-24 22:47:47 +02:00
Bartłomiej Dach
dcb3e651e8
Merge pull request #18383 from Joehuu/fix-mod-panel-click-area
Fix incorrect left/right clicking area of mod panels
2022-05-24 22:18:03 +02:00
Bartłomiej Dach
2dd0b3f8d9
Merge branch 'master' into fix-mod-panel-click-area 2022-05-24 21:52:37 +02:00
Dan Balasescu
25f35b3408
Merge pull request #18394 from peppy/editor-beat-divisor-on-mouse-down
Handle beat divisor input on mouse down, rather than mouse up
2022-05-24 19:06:14 +09:00
Dan Balasescu
46b2f1ecc2
Merge pull request #18392 from peppy/editor-remove-triangle-button-usage
Remove `TriangleButton` usage in editor
2022-05-24 18:51:02 +09:00
Dean Herbert
0bcf8c846c Change editor colour scheme to aquamarine 2022-05-24 18:43:22 +09:00
Dean Herbert
648cee7106 Remove editor screen transitions for now 2022-05-24 18:43:22 +09:00
Dean Herbert
3f5ccd4db8 Update timing screen sections to newer design metrics 2022-05-24 18:43:22 +09:00
Dean Herbert
c02ec05056 Remove remaining usage of EditorRoundedScreen 2022-05-24 18:43:22 +09:00
Dean Herbert
1d196262d0 Remove unused OnTimelineLoaded flow 2022-05-24 18:43:22 +09:00
Dean Herbert
a905731053 Update timeline colours and paddings to match new designs 2022-05-24 18:43:22 +09:00
Dean Herbert
17206bbebf Update screen padding and colouring to better match new designs 2022-05-24 18:43:22 +09:00
Dean Herbert
a2bfd0ba41 Merge branch 'editor-remove-triangle-button-usage' into editor-combined 2022-05-24 18:43:02 +09:00
Dean Herbert
741cfcc614 Merge branch 'editor-beat-divisor-on-mouse-down' into editor-combined 2022-05-24 18:43:01 +09:00
Dean Herbert
0471f35d84 Merge branch 'editor-beat-divisor-size-static' into editor-combined 2022-05-24 18:43:00 +09:00
Dean Herbert
33fd1555f2 Update TestSceneRoundedButton with new colour assertions 2022-05-24 18:42:45 +09:00
Dan Balasescu
8a297cf7b6
Merge pull request #18390 from peppy/timeline-initial-bindings
Fix `Timeline` potentially not updating visuals to correct state on first display
2022-05-24 18:39:41 +09:00
Dean Herbert
bb82abe48d Update test to use new triangle type resolution 2022-05-24 18:38:08 +09:00
Dean Herbert
3ace5f135e Adjust marker to match design proportions 2022-05-24 18:26:01 +09:00
Dean Herbert
3c2e57bf00 Update BeatDivisorControl to better match new designs and metrics 2022-05-24 18:26:01 +09:00
Dean Herbert
e6087f5f5b Handle beat divisor input on mouse down, rather than mouse up
It felt way too unresponsive.
2022-05-24 18:16:19 +09:00
Dean Herbert
4a88affd03 Move beat divisor tick size retrieval to static methods 2022-05-24 18:15:20 +09:00
Dean Herbert
a346990a8c Remove TriangleButton usage in editor 2022-05-24 18:13:09 +09:00
Dean Herbert
f00dd27fcd Move OverlayColourProvider provisioning of RoundedButton to SettingsButton for now 2022-05-24 18:11:54 +09:00
Dean Herbert
1137545d4a Fix Timeline potentially not updating visuals to correct state on first display 2022-05-24 18:11:05 +09:00
Dean Herbert
49a2173646 Avoid needlessly updating display (and add better documentation on chosen scale) 2022-05-24 14:36:44 +09:00
Dean Herbert
4fcdcef166 Add indexing on each wavefrom row 2022-05-24 14:36:44 +09:00
Dean Herbert
c1720c128d Dim rows which are not part of the active control point (and offset centre) 2022-05-24 14:36:44 +09:00
Dean Herbert
7040dec013 Fix disabled bindable woes by not using TimingControlPoint.DEFAULT 2022-05-24 14:36:44 +09:00
Dean Herbert
588c5d1583 Add initial waveform comparison display 2022-05-24 14:36:44 +09:00
Dean Herbert
4bcf15f632 Refactor test to allow waveform testing 2022-05-24 14:36:44 +09:00
Dean Herbert
db593fe0f0
Merge pull request #18386 from smoogipoo/fix-catmull-regression
Fix Catmull slider parsing with duplicate initial point
2022-05-24 13:57:56 +09:00