1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 10:42:54 +08:00
Commit Graph

51877 Commits

Author SHA1 Message Date
Dan Balasescu
cab4299f0c
Merge pull request #18429 from Joehuu/fix-incorrect-beatmap-info-status-pill
Fix beatmap info status pill being incorrect on multiple status beatmaps
2022-05-27 10:42:37 +09:00
Joseph Madamba
2b5aa35b56 Fix beatmap info status pill being incorrect on multiple status beatmaps 2022-05-26 17:52:17 -07:00
Joseph Madamba
0cdefbc6df Add failing beatmap info status test 2022-05-26 17:52:17 -07:00
Bartłomiej Dach
0d760e707e
Merge pull request #18423 from smoogipoo/fix-multiplayer-race
Fix multiplayer race condition when starting gameplay
2022-05-26 21:13:10 +02:00
Bartłomiej Dach
e7a266e742
Merge branch 'master' into fix-multiplayer-race 2022-05-26 20:43:20 +02:00
Bartłomiej Dach
4b772cfc6e
Merge pull request #18413 from peppy/editor-bottom-bar-new-design
Update bottom bar components to new design language
2022-05-26 20:20:30 +02:00
Bartłomiej Dach
818b344c2b
Merge branch 'master' into editor-bottom-bar-new-design 2022-05-26 19:26:35 +02:00
Dean Herbert
f71f761a3f
Merge pull request #18377 from jai-x/new-chat-integrate
Integrate new chat into game
2022-05-26 21:02:36 +09: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
Dan Balasescu
c524b665ad
Merge pull request #18419 from bdach/mod-overlay/enable-disable-select-deselect
Disable select/deselect all buttons on mod overlay when they have no effect
2022-05-26 12:26:10 +09:00
Bartłomiej Dach
af1d4d3aee
Use more proper button subtypes in tests 2022-05-25 23:06:12 +02: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
Bartłomiej Dach
4f8b6b52ba
Add failing test coverage for select/deselect all enable behaviour 2022-05-25 21:49:31 +02:00
Jai Sharma
f94afa5f8c Code quality 2022-05-25 18:28:18 +01:00
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
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
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
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
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
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
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
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