1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Commit Graph

33268 Commits

Author SHA1 Message Date
sw1tchbl4d3
3183621d3d Add search bar for the CurrentlyPlayingDisplay 2022-05-26 22:57:24 +02:00
Bartłomiej Dach
e7a266e742
Merge branch 'master' into fix-multiplayer-race 2022-05-26 20:43:20 +02:00
Bartłomiej Dach
818b344c2b
Merge branch 'master' into editor-bottom-bar-new-design 2022-05-26 19:26:35 +02:00
Dan Balasescu
0224947de0 Add comment about how starting gameplay works 2022-05-26 20:09:47 +09:00
Dan Balasescu
3915b8e414 Fix multiplayer race condition when starting gameplay 2022-05-26 20:01:33 +09:00
Dean Herbert
a98d0cf0d8 Simplify channel filter method 2022-05-26 18:48:11 +09:00
Dean Herbert
b2607196b8 Merge branch 'master' into new-chat-integrate 2022-05-26 18:38:26 +09:00
Dean Herbert
fb586fe0b2 Merge branch 'master' into editor-bottom-bar-new-design 2022-05-26 18:32:28 +09:00
Dean Herbert
93c94b8ea0 Fix test caching woes 2022-05-26 18:30:37 +09:00
Dean Herbert
7f4ea5d522 Use left alignment and remove hacky text positioning code 2022-05-26 18:12:28 +09:00
Dean Herbert
abb69a49b0 Handle server shutdown messages in room creation and spectator initialisation 2022-05-26 18:03:41 +09:00
Dean Herbert
63dd9bd493 Expose Reconnect logic in HubClientConnector 2022-05-26 18:02:50 +09:00
Bartłomiej Dach
a1b8fa0992
Disable "select all mods" button if all are selected 2022-05-25 23:06:12 +02:00
Bartłomiej Dach
071e158a29
Expose available mod state outwardly as a bindable 2022-05-25 23:06:12 +02:00
Bartłomiej Dach
f0303d76e8
Split off "select all mods" button to separate class 2022-05-25 22:18:30 +02:00
Bartłomiej Dach
a3f2962558
Disable "deselect all mods" button if none are selected 2022-05-25 22:15:02 +02:00
Bartłomiej Dach
a4bd399b0c
Split off "deselect all mods" button to separate class 2022-05-25 22:14:45 +02:00
Jai Sharma
f94afa5f8c Code quality 2022-05-25 18:28:18 +01:00
Dean Herbert
acd554d918 Update time info and add bpm 2022-05-25 23:54:59 +09:00
Dean Herbert
2c61a9d3d1 Update bottom bar components to new design language (mostly) 2022-05-25 23:54:59 +09:00
Dean Herbert
8791e3b9ef Split BottomBar out of Editor 2022-05-25 23:54:59 +09:00
Jai Sharma
997fc716e8 Split out the channel list labels from the channel list item flow 2022-05-25 15:15:46 +01:00
Jai Sharma
c0da05dda0 Use an array of channels to exclude from the overlay 2022-05-25 15:15:26 +01: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
Jai Sharma
cd90d29315 Ensure channel traversal shortcut scrolls channel list item into view 2022-05-25 12:37:28 +01:00
Jai Sharma
4a36f3aa4c Ensure channel traversal shortcut is using visual order 2022-05-25 12:29:04 +01: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
Dean Herbert
f1d4902be5 Remove unnecessary bindable cast 2022-05-25 19:25:23 +09:00
Dean Herbert
49ab031e75 Allow traversing in both directions using ctrl-tab shortcuts 2022-05-25 18:42:49 +09:00
Dean Herbert
a92089c443 Change filter method to consider all non-system channels as joinable 2022-05-25 18:42:33 +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
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
Jai Sharma
f6810d3f59 Add keyboard shortcuts to ChatOverlayV2 with tests 2022-05-24 23:05:25 +01: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
61c093c109
Merge branch 'master' into rounded-button-colour-default 2022-05-24 22:47:47 +02:00
Jai Sharma
fce527b0df Schedule channel manager bindable events to ensure they happen after the first poll 2022-05-24 21:25:27 +01: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
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
Dan Balasescu
9259aa94f1 Fix Catmull slider parsing with duplicate initial point 2022-05-24 11:47:42 +09:00
Joseph Madamba
1f935cacf4 Add spotlighted beatmaps filter to beatmap listing 2022-05-23 18:47:04 -07:00
Dan Balasescu
96e438edee
Merge pull request #18378 from bdach/back-button-closes-dropdowns
Make "back" binding close opened dropdown menus
2022-05-24 10:45:28 +09:00
Joseph Madamba
ed0b841df0 Fix incorrect left/right clicking area of mod panels 2022-05-23 18:29:26 -07:00
apollo-dw
eae2378466 Add WIP to search filters 2022-05-24 01:49:07 +01:00
Bartłomiej Dach
3847a586f1
Make GlobalAction.Back close all opened dropdown menus 2022-05-23 23:37:40 +02:00
Jai Sharma
d2a49ca266 Use ChatOverlayV2 in message notifier and tests 2022-05-23 21:02:50 +01:00
Jai Sharma
58d39734d0 Integrate ChatOverlayV2 into main game 2022-05-23 21:02:47 +01:00
Susko3
88217e0c98 Adjust ScrollDelta usages to account for normalised IsPrecise values 2022-05-23 20:22:27 +02:00
Dean Herbert
7d93778355
Merge pull request #18290 from jai-x/new-chat-remove-selector-item
Use dummy channel to show selector and remove `ChannelListSelector`
2022-05-23 15:49:00 +09:00
Dean Herbert
87947c6ef0
Merge pull request #18340 from smoogipoo/hp-ratio-improvements
Adjust HP drain and recoveries to closer match osu-stable
2022-05-23 15:19:42 +09:00
Dan Balasescu
7d0470794b
Merge pull request #18353 from frenzibyte/spectator-catch-up-work-alt
Disallow multi-spectator player clocks from being started/stopped externally
2022-05-23 13:59:54 +09:00
Dan Balasescu
e3c1c78b17
Merge pull request #18348 from maromalo/mod-key-multiplayer
Add toggle mod hotkey support in multiplayer room
2022-05-23 13:45:02 +09:00
Dan Balasescu
f111d33b25
Merge pull request #18339 from peppy/editor-timing
Add first pieces of editor timing UI
2022-05-23 11:12:22 +09:00
Bartłomiej Dach
9308d0b012
Merge branch 'master' into mod-key-multiplayer 2022-05-22 19:30:10 +02:00
Dean Herbert
9c3d0dafbd Remove implementation at Player level
Turns out this isn't required in the end due to implementation at
`MasterGameplayClockContainer`.
2022-05-23 02:00:21 +09:00
Dean Herbert
267bef959f
Remove unnecessary cache type specification
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-05-23 02:00:04 +09:00
Dean Herbert
c9ea87e6be Revert easing for now 2022-05-23 00:03:42 +09:00
Dean Herbert
007582afb9 Remove unused usings resulting from namespace move 2022-05-22 23:55:33 +09:00
Dean Herbert
3a7233bd6e Move interface to more appropriate namespace 2022-05-22 22:49:24 +09:00
Dean Herbert
eabf578282 Use interface to convey beat sync information 2022-05-22 22:44:54 +09:00
Dean Herbert
d84119ac06
Merge pull request #18343 from frenzibyte/waveform-test-beatmap-failure
Fix `WaveformTestBeatmap`s potentially providing disposed track
2022-05-22 21:21:28 +09:00
maromalo
fc25d248ad Test coverage + no virtual 2022-05-21 18:16:29 -03:00
Bartłomiej Dach
21e1576b2f
Fix appearance of sheared button borders after click
The border would previously get brighter after click, but then dim
instantly when the flash layer has fully faded out. The underlying issue
there is https://github.com/ppy/osu-framework/issues/5191, but
`ShearedButton` was placing the flashing layer incorrectly anyway, as
the intent was that it should also apply to the border.
2022-05-21 20:53:23 +02:00
Jai Sharma
fb06b7658b Merge branch 'master' into new-chat-remove-selector-item 2022-05-21 17:30:06 +01:00
Salman Ahmed
27da293b40 Make catch-up spectator clocks running state immutable externally 2022-05-21 17:12:04 +03:00
Salman Ahmed
a17eed64f9 Use Track to ensure its loaded before transferring 2022-05-21 16:52:16 +03:00
Salman Ahmed
a42f5ea34e Bring back virtual track condition given its cheapness
Will still keep the override in `ClockBackedTestWorkingBeatmap` because
it still relies on a local track store and will fail the moment it uses
a non-virtual track.
2022-05-21 16:51:56 +03:00
Salman Ahmed
466ed3c791
Fix wrong return xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2022-05-21 16:43:31 +03:00
Dean Herbert
9a780bcad3 Remove unused using 2022-05-21 21:56:05 +09:00
Dean Herbert
376549ce09 Use ToLocalisableString instead of CurrentCulture 2022-05-21 21:48:51 +09:00
maromalo
2bd4c126d3 Blank line
Forgot to save.
2022-05-21 05:07:24 -03:00
maromalo
a7aa36a825 Add OnPressed to button 2022-05-21 04:55:42 -03:00
Dean Herbert
c587d10cc3 Revert storage workaround 2022-05-21 15:55:07 +09:00
Dean Herbert
ba21556d4e Update framework 2022-05-21 15:54:43 +09:00
Dean Herbert
fa1d267b10 Merge branch 'safe-file-writes' into update-framework 2022-05-21 15:17:52 +09:00
Dean Herbert
982856a8b2 Merge branch 'localisable-filter-items' into update-framework 2022-05-21 15:17:51 +09:00
Dean Herbert
72386d9377 Fix incorrect storage being used in CreateFileSafely implementation 2022-05-21 15:17:10 +09:00
Dean Herbert
2f69c099cd Merge branch 'master' into safe-file-writes 2022-05-21 15:16:20 +09:00
Dean Herbert
5bf17dde9f Fix missing MutatePath calls 2022-05-21 14:43:35 +09:00
Dean Herbert
d3f115bfe2 Remove redundant qualifiers 2022-05-21 13:53:58 +09:00
Dean Herbert
7dcb88759a Remove unnecessary using statement 2022-05-21 00:28:17 +09:00
Salman Ahmed
84a3cee452 Apply rate multiplier outside BPM rounding 2022-05-20 18:04:12 +03:00
Dean Herbert
4633eed78c Merge branch 'master' into localisable-filter-items 2022-05-20 23:55:16 +09:00
Salman Ahmed
596853da8f Fix song select potentially displaying BPM range with equal min/max values 2022-05-20 17:53:28 +03:00
Dean Herbert
2b3ec53fed Merge branch 'safe-file-writes' into localisable-filter-items 2022-05-20 23:51:24 +09:00
Dean Herbert
a2950d9d4e Update framework 2022-05-20 23:49:03 +09:00
Dean Herbert
8db80b92bb Fix metronome not using EditorBeatmap causing editor updates to not propagate immediately 2022-05-20 23:24:57 +09:00
Dean Herbert
c3bfbe8880 Allow BeatSyncedContainer to prefer EditorBeatmap when available 2022-05-20 23:24:57 +09:00
Salman Ahmed
abf9039109 Use == instead of ?? 2022-05-20 16:08:31 +03:00
Salman Ahmed
cef99fd020 Disallow transferring track from test WorkingBeatmaps which have local stores 2022-05-20 16:08:31 +03:00
Salman Ahmed
c78d90ccbd Refactor track transferring logic for ability to override and disallow 2022-05-20 14:43:07 +03:00
Dan Balasescu
b29172ea45 Increase HP lost for misses 2022-05-20 17:53:14 +09:00
Dean Herbert
82eb5fd2c9 Add centre line on weight 2022-05-20 17:30:04 +09:00
Dean Herbert
2e21d75b10 Move metronome into own class and rename to avoid conflict with mod sounds 2022-05-20 17:30:04 +09:00
Dean Herbert
cf97f4e409 Add centre marker 2022-05-20 17:30:04 +09:00
Dean Herbert
4712e512d7 Apply edge smoothness and make weight more accented 2022-05-20 17:30:04 +09:00
Dean Herbert
8487d2c48a Interpolate bpm label and fix incorrect angle logic 2022-05-20 17:30:04 +09:00
Dean Herbert
21072a26ef Add locking wedge 2022-05-20 17:30:04 +09:00
Dean Herbert
79878a4ec2 Metrics adjust and labelling 2022-05-20 17:30:04 +09:00
Dean Herbert
cf1ef28f72 Add taper and more correctly shaped weight 2022-05-20 17:30:04 +09:00
Dean Herbert
42179568f3 Initial animation pass on metronome 2022-05-20 17:30:04 +09:00
Dean Herbert
ce7be940e2 Setup basics for control and test 2022-05-20 17:30:04 +09:00
Dan Balasescu
3fdff7bbcb Make Meh judgements not drain HP 2022-05-20 15:36:30 +09:00
Dan Balasescu
64a371638e
Merge pull request #18236 from peppy/snap-unification
Add `enum` to snap method as alternative to multiple nested invocations
2022-05-20 11:35:05 +09:00
Jai Sharma
c37d1e4fae Ensure current channel is set to the ChannelListingChannel when it becomes null 2022-05-19 11:45:39 +01:00
Dean Herbert
136ecb45e2 Rename dummy channel and move to a nested class inside the ChannelListing itself 2022-05-19 19:26:14 +09:00
Dean Herbert
63c9776365 Fix oversight in bindable logic in new overlay class 2022-05-19 19:24:18 +09:00
Dean Herbert
363e7a6f53 Simplify toolbar hiding logic in FirstRunSetupOverlay
Rather than fiddling around with the activation modes, this seems like a
much cleaner way to make things work.

Closes https://github.com/ppy/osu/issues/18277.
2022-05-19 16:42:48 +09:00
Dean Herbert
b3d6f76cfa Add "None" snap type to fix flags not working correctly 2022-05-19 15:57:17 +09:00
Dean Herbert
16075d2a2f
Merge pull request #18321 from smoogipoo/legacy-catmull
Fix compatibility issues with legacy Catmull sliders
2022-05-19 15:42:21 +09:00
Dean Herbert
d187ca2d8c
Merge pull request #18246 from jai-x/new-chat-cache-loaded-channels
Add drawable channel caching to new chat overlay
2022-05-19 15:15:47 +09:00
Dean Herbert
70bd40ce44 Fix incorrect count of beatmaps available to import 2022-05-19 14:01:24 +09:00
Dean Herbert
a443200d0d Make dependency nullable to allow for safer disposal unbinding 2022-05-19 13:49:52 +09:00
Salman Ahmed
5d3878a737 Add test coverage for slow-loading channels 2022-05-18 22:58:39 +03:00
Jai Sharma
371738b047 Check against the loaded drawable channel 2022-05-18 20:00:42 +01:00
Dean Herbert
0cee90e156 Add common strings for missing localisable content 2022-05-18 21:32:57 +09:00
Dean Herbert
d54e1503c7 Rename interaction toggle method 2022-05-18 21:32:57 +09:00
Dean Herbert
fa09270e62 Remove left-over todo 2022-05-18 21:32:57 +09:00
Dan Balasescu
731f0960ec Don't merge adjacent legacy Catmull segments 2022-05-18 17:16:24 +09:00
Jai Sharma
dd4b11c593 Re-add exception handling on PM message request failure 2022-05-18 01:47:23 +01:00
Jai Sharma
4015042e36 Ensure close button component is not stored as a Drawable 2022-05-18 01:35:39 +01:00
Bartłomiej Dach
c2555a91c7
Merge branch 'master' into first-run-screen-import-from-stable 2022-05-17 22:52:01 +02:00
Bartłomiej Dach
10b881dbf7
Merge branch 'master' into first-run-screen-button-ux 2022-05-17 22:27:49 +02:00