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

44612 Commits

Author SHA1 Message Date
Dean Herbert
38cd383aaf Remove local handling of realm when switching thread modes 2021-10-01 00:27:54 +09:00
Dean Herbert
b8b61a196f
Merge pull request #14891 from smoogipoo/mp-currently-playing-map
Add currently playing map to multiplayer lounge
2021-09-30 14:22:07 +09:00
smoogipoo
816018edb7 Move hosted by text into nullcheck 2021-09-30 12:04:30 +09:00
smoogipoo
202a602d2f Change default status to "ready to play" 2021-09-30 12:03:44 +09:00
smoogipoo
ea30445efc Remove verbatim string 2021-09-30 12:03:34 +09:00
smoogipoo
18ab6747f7 Fix tests 2021-09-30 12:01:28 +09:00
smoogipoo
619a907c47 Fix zero height grid 2021-09-30 12:01:26 +09:00
smoogipoo
56b3c8aa9a Remove forgotten text 2021-09-30 11:52:14 +09:00
smoogipoo
c83dd7d2b6 Merge OnlinePlayComposite and RoomSubScreenComposite 2021-09-29 20:55:20 +09:00
smoogipoo
c9c2d20544 Limit max size 2021-09-29 20:44:38 +09:00
smoogipoo
67d847fbd3 Add room status text to DrawableRoom 2021-09-29 20:24:49 +09:00
smoogipoo
5f921c7836 Change SelectedItem to show the last item by default 2021-09-29 20:24:32 +09:00
Dan Balasescu
8bbd8cd948
Merge pull request #14890 from peppy/skin-editor-nullable-allowed
Fix skin editor potentially crashing during close process
2021-09-29 20:19:19 +09:00
smoogipoo
d89577b2e7 Add host to DrawableRoomParticipantsList 2021-09-29 19:34:40 +09:00
smoogipoo
73ee82ee2b Rename RecentParticipantsList -> DrawableRoomParticipantsList 2021-09-29 19:15:58 +09:00
Dean Herbert
7914daaef0 Remove unused using 2021-09-29 19:09:48 +09:00
Dean Herbert
4fd19cbb0d Use null check instead of assert in Hide() due to public exposure 2021-09-29 18:58:43 +09:00
Dean Herbert
c5b7e97bd9 Fix skin editor potentially crashing during close process
As reported at
https://github.com/ppy/osu/discussions/14850#discussioncomment-1399382.
2021-09-29 18:53:49 +09:00
Dan Balasescu
5edc5c2adc
Merge pull request #14826 from peppy/move-startup-concurrency-check
Move startup concurrency check to higher level
2021-09-29 18:28:15 +09:00
Dan Balasescu
754c56d7ae
Merge branch 'master' into move-startup-concurrency-check 2021-09-29 17:20:20 +09:00
Dan Balasescu
6019839d66
Merge pull request #14825 from peppy/enable-ipc-test
Re-enable IPC import test
2021-09-29 17:17:22 +09:00
Dan Balasescu
ce3cf72a77
Merge pull request #14888 from peppy/rename-json-key-resolver
Rename JSON key resolver to better expose what it's doing
2021-09-29 16:58:42 +09:00
Dan Balasescu
f96effb2ea
Merge branch 'master' into enable-ipc-test 2021-09-29 16:32:53 +09:00
Dan Balasescu
d60cba97da
Merge pull request #14889 from peppy/update-framework
Update framework
2021-09-29 14:40:11 +09:00
Dean Herbert
dcf87e97c2 Update framework 2021-09-29 14:03:41 +09:00
Dean Herbert
117d47bf7f Rename JSON key resolver to better expose what it's doing 2021-09-29 11:26:37 +09:00
Dan Balasescu
625711e6d2
Merge pull request #14776 from peppy/fix-pause-with-audio-offset
Avoid accounting for the pause pitch adjust effect when "fixing" hardware offset adjustments
2021-09-28 18:44:22 +09:00
Dean Herbert
1567faa7b2
Merge pull request #14865 from bdach/fix-legacy-repeat-arrow-fallback
Fix repeat arrow texture not falling back to default legacy skin
2021-09-28 11:07:18 +09:00
Dean Herbert
4958771fbf
Merge pull request #14864 from bdach/fix-range-selection-crash-after-keyboard-selection
Fix timeline range selection crashing after non-mouse selection
2021-09-28 07:05:00 +09:00
Bartłomiej Dach
5bd09a4a30
Rename inner lambda parameter 2021-09-27 22:21:14 +02:00
Bartłomiej Dach
7a0499ad07
Fix repeat arrow texture not falling back to default legacy skin 2021-09-27 21:45:26 +02:00
Bartłomiej Dach
ca6cbca04a
Fix range selection crashing after non-mouse selection 2021-09-27 20:54:29 +02:00
Bartłomiej Dach
1a1fc00b44
Add failing test case 2021-09-27 20:54:29 +02:00
Dean Herbert
dc24fd7e5b
Merge pull request #14859 from peppy/local-database-strings
Move database connection string operations local
2021-09-27 21:46:52 +09:00
Dean Herbert
bcdbffbca0 Update framework 2021-09-27 20:56:54 +09:00
Dean Herbert
d4310f5d9a Move database connection string operations local
In line with framework changes in
https://github.com/ppy/osu-framework/pull/4793.
2021-09-27 17:32:41 +09:00
Dan Balasescu
7f45bd27f2
Merge pull request #14851 from bdach/blueprint-container-sorting
Rewrite blueprint sorting logic to be more robust
2021-09-27 15:13:16 +09:00
Dean Herbert
df85092426 Resolve inner items early in process and rename variable 2021-09-27 14:24:17 +09:00
Dean Herbert
41fb3371e5
Merge branch 'master' into blueprint-container-sorting 2021-09-27 14:12:09 +09:00
Dean Herbert
91c5328fc6
Merge pull request #14853 from bdach/timeline-shift-click-selection
Add support for range selection to editor timeline
2021-09-27 14:11:44 +09:00
Dean Herbert
5466fb08fd
Merge branch 'master' into timeline-shift-click-selection 2021-09-27 13:40:39 +09:00
Dan Balasescu
6d7403df5b
Merge pull request #14852 from bdach/timeline-selection-test-coverage
Add test coverage for timeline selection logic
2021-09-27 13:19:08 +09:00
Bartłomiej Dach
d3203f83dd
Add implementation of range selection 2021-09-26 20:12:26 +02:00
Bartłomiej Dach
81d160c85a
Add test covering expected UX of range selection 2021-09-26 19:27:47 +02:00
Bartłomiej Dach
0de7db5840
Add test coverage for timeline selection logic 2021-09-26 19:20:55 +02:00
Bartłomiej Dach
a401e184d0
Merge pull request #14812 from peppy/diffcalc-optimisations
Reduce allocations during beatmap conversion process
2021-09-26 19:13:31 +02:00
Bartłomiej Dach
7caa0a81ec
Rename TestScene{Editor -> Composer}Selection
In line with an upcoming split in functionality between the composer
blueprint container and the timeline blueprint container.
2021-09-26 17:22:58 +02:00
Bartłomiej Dach
6dc3e66c93
Include combo information when determining ordering if available 2021-09-26 15:52:25 +02:00
Bartłomiej Dach
a86b9893ac
Always re-sort blueprints before adding/removing one 2021-09-26 15:48:56 +02:00
Bartłomiej Dach
ce70d1082d
Add failing test for "ghost timeline blueprint" 2021-09-26 15:29:00 +02:00