1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-19 03:32:54 +08:00
Commit Graph

44648 Commits

Author SHA1 Message Date
apollo-dw
7d77c279e1 Merge branch 'blinds-pp' of https://github.com/mrowswares/osu into blinds-pp 2021-10-01 15:27:17 +01:00
apollo-dw
57b9a91cba trim whitespace cuz code quality 2021-10-01 15:26:59 +01:00
apollo
d13e8c0354
Merge branch 'ppy:master' into blinds-pp 2021-10-01 15:24:13 +01:00
Dan Balasescu
a620b55d55
Merge pull request #14900 from peppy/model-downloader-split
Split `ArchiveModelManager` into two pieces
2021-10-01 23:16:09 +09:00
apollo-dw
7884dbbd11 adjust formulae 2021-10-01 15:04:44 +01:00
Dan Balasescu
d24f89fead
Merge pull request #14906 from peppy/update-realm-context-factory
Refine `RealmContext` implementation
2021-10-01 22:57:03 +09:00
Dan Balasescu
6a172d54d5
Merge branch 'master' into model-downloader-split 2021-10-01 22:34:39 +09:00
Dan Balasescu
bee14a0c55
Merge pull request #14899 from peppy/beatmap-manager-split
Split `BeatmapManager` into two pieces
2021-10-01 22:30:53 +09:00
Dean Herbert
a32f5d44e2
Improve clarity of xmldoc
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2021-10-01 22:23:51 +09:00
Dan Balasescu
154c412f34
Merge branch 'master' into beatmap-manager-split 2021-10-01 21:46:27 +09:00
Dan Balasescu
cfc3597e1c
Merge pull request #14896 from peppy/online-lookup-cache-separation
Split out `BeatmapOnlineLookupQueue` from `BeatmapManager`
2021-10-01 21:46:04 +09:00
Dean Herbert
b51fd00ba3 Guard against disposal in all context retrievals 2021-10-01 03:46:53 +09:00
Dean Herbert
8557530cd5 Add back main context locking 2021-10-01 03:45:00 +09:00
Dean Herbert
c71cf1e220 Fix incomplete xmldoc 2021-10-01 01:51:31 +09:00
Dean Herbert
3ddb348252 Merge branch 'online-lookup-cache-separation' into beatmap-manager-split 2021-10-01 01:49:31 +09:00
Dean Herbert
2ed28f625a Pass whole queue in rather than function 2021-10-01 01:46:37 +09:00
Dean Herbert
428c7830d9 Pass online lookup queue in as a whole, rather than function 2021-10-01 01:45:21 +09:00
Dean Herbert
27c4f2b06e Add missing disposal 2021-10-01 01:38:50 +09:00
Dean Herbert
dde19f2e81
Fix unbalanced brackets
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-10-01 01:37:51 +09:00
Dean Herbert
9fa901f6aa Refine RealmContext implementation API 2021-09-30 23:56:38 +09:00
Dean Herbert
3e3b9bc963 Split out IModelDownloader and also split apart ScoreManager 2021-09-30 18:25:20 +09:00
Dean Herbert
0a00bc7795 Split out IPostNotifications into an interface 2021-09-30 18:21:34 +09:00
Dean Herbert
fd13142a15 Add missing interface to BeatmapManager 2021-09-30 18:21:24 +09:00
Dean Herbert
7a72747d88 Add back optional online lookups 2021-09-30 17:18:39 +09:00
Dean Herbert
90225f2082 Hook up all required interfaces to new BeatmapManager 2021-09-30 17:18:39 +09:00
Dean Herbert
5618c9933b Expose more pieces of ArchiveModelManager via interfaces 2021-09-30 16:44:39 +09:00
Dean Herbert
d21139b03e Split out database portion from BeatmapManager 2021-09-30 15:43:49 +09:00
Dean Herbert
e7e0473323 Split out WorkingBeatmapCache from BeatmapManager 2021-09-30 15:40:41 +09:00
Dean Herbert
8a6501fa58 Add basic component level xmldoc 2021-09-30 14:46:07 +09:00
Dean Herbert
6ffd9fdcfa Split out BeatmapOnlineLookupQueue from BeatmapManager 2021-09-30 14:46:01 +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