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

47196 Commits

Author SHA1 Message Date
Dan Balasescu
f4e07f1483 Merge branch 'master' into diffcalc-cli-arg 2021-12-03 20:34:59 +09:00
Dan Balasescu
d5803e541b Give playlist items a PlayedAt date 2021-12-03 20:25:51 +09:00
Dan Balasescu
4145a16d5b
Merge pull request #15920 from peppy/clean-up-unused-resolves
Clean up unused resolved properties
2021-12-03 20:08:48 +09:00
Dan Balasescu
e350c68b5f
Merge pull request #15918 from peppy/volume-adjust-during-gameplay-alt-exception
Fix alt-scroll not adjusting volume in gameplay when scroll wheel is disabled
2021-12-03 19:09:20 +09:00
Dean Herbert
1eed2436e6 Clean up unused resolved properties 2021-12-03 18:49:49 +09:00
Dean Herbert
2acf46154a Remove many unused resolutions of RulesetStore 2021-12-03 18:16:29 +09:00
Dean Herbert
e75e209053 Cache and consume IRulesetStore where feasible 2021-12-03 18:16:01 +09:00
Dean Herbert
15db1372aa Add missing equality implementations on IRulesetInfo 2021-12-03 18:01:45 +09:00
Dean Herbert
675ecb603f Add IRulesetStore to allow for transitional usage in upcoming manager classes 2021-12-03 17:57:40 +09:00
Dan Balasescu
7084ef5245
Merge pull request #15915 from peppy/tournament-bracket-parsing-fix
Fix `bracket.json` potentially getting saved after parsing failure
2021-12-03 17:36:08 +09:00
Dan Balasescu
637852a2aa
Merge pull request #15916 from peppy/dont-send-unnecessary-params-beatmap-get
Avoid sending empty parameters in `GetBeatmapRequest`
2021-12-03 17:33:58 +09:00
Dean Herbert
6b73672403 Stop Player from blocking volume adjust when Alt it held
Similar case to what we already have in `OsuScrollContainer`, so there
is precedent for handling this locally in this fashion.
2021-12-03 17:18:07 +09:00
Dean Herbert
aaa46960b3 Reword mouse wheel disable setting to better explain its purpose 2021-12-03 17:18:07 +09:00
Dean Herbert
2927b235de Add test coverage of mouse wheel scroll adjusting volume 2021-12-03 17:18:07 +09:00
Dan Balasescu
9d6fe558c2 Update TestMultiplayerClient with expired item ordering 2021-12-03 17:01:33 +09:00
Dan Balasescu
487a71312e Split out code so base methods aren't called 2021-12-03 16:40:20 +09:00
Dean Herbert
e4b296e16e Use OptIn serialisation on SkinInfo to avoid writing unnecessary information 2021-12-03 16:36:27 +09:00
Dean Herbert
dad5b06e84 Avoid sending empty parameters in GetBeatmapRequest 2021-12-03 16:23:39 +09:00
Dean Herbert
5158736839 Avoid saving bracket if parsing failed, at all costs 2021-12-03 16:06:38 +09:00
Dean Herbert
ba05a0a383 Centralise specification of bracket.json filename 2021-12-03 16:04:11 +09:00
Dean Herbert
f9ad307526 Apply nullable 2021-12-03 15:51:00 +09:00
Dean Herbert
79d723172a Remove Console.WriteLine usage 2021-12-03 15:48:53 +09:00
Dean Herbert
33992e11e0 Split out ruleset lookup code 2021-12-03 15:48:53 +09:00
Dean Herbert
2262b7b331 Adjust logging to avoid using tabs 2021-12-03 15:48:53 +09:00
Dan Balasescu
0a1304b92a Remove gameplay_order, use existing playlist_order 2021-12-03 15:45:13 +09:00
Dean Herbert
9c717ce7ec
Merge branch 'master' into diffcalc-cli-arg 2021-12-03 15:10:55 +09:00
Dan Balasescu
bd5140cbdf
Merge pull request #15909 from peppy/update-deps
Update framework and resources
2021-12-03 15:09:46 +09:00
Dan Balasescu
b75a5b778e Update history list to also sort by gameplay order 2021-12-03 15:05:56 +09:00
Dan Balasescu
1d2d1bfcf3 Add UpdatedAt to MultiplayerPlaylistItem 2021-12-03 15:05:56 +09:00
Dean Herbert
9803e63e6f Update IPC usage to return null 2021-12-03 14:30:15 +09:00
Dean Herbert
6142566974 Update resources 2021-12-03 14:26:53 +09:00
Dean Herbert
abf7735b84 Update framework 2021-12-03 14:18:03 +09:00
Dan Balasescu
10932dd282 Remove now unnecessary test 2021-12-02 22:58:25 +09:00
Dan Balasescu
806ca5d4de Update TestMultiplayerClient implementation to match server 2021-12-02 22:58:12 +09:00
Dan Balasescu
933fd49cff Fix missed callbacks due to AddOnce() schedules 2021-12-02 22:33:14 +09:00
Dan Balasescu
9760a2b087 Update MultiplayerQueueList to take advantage of GameplayOrder 2021-12-02 22:33:14 +09:00
Dan Balasescu
ba8af303cc Add GameplayOrder to MultiplayerPlaylistItem 2021-12-02 22:33:14 +09:00
Dean Herbert
cdf2fa9930 Serialise and deserialise SkinInfo.InstantiationInfo to allow for more correct imports
Until now, skins were always imported using the `LegacySkin`
instantiation type. For cases where a user has edited the lazer or
classic default (via the new skin editor), which would result in
incorrect fallback paths after exporting and importing the edited skin.
2021-12-02 18:05:16 +09:00
Dean Herbert
b976848774 Add failing test coverage of exporting default skin importing with incorrect type 2021-12-02 18:05:16 +09:00
Dean Herbert
0e82e9355b Ensure skin is saved immediately after becoming mutable
Without doing this, the JSON content is not written to the file. A user
assumption is that as soon as a skin shows up in the skin list as
exportable, it should export correctly, so it makes sense that it should
be in a sane state even if the user has not made any changes in the skin
editor yet.

Going forward, we might move more of the json serialisation logic out,
and run for consistency as part of the import process. This seems like
the simplest way to guarantee things for now, though.
2021-12-02 17:42:17 +09:00
Dean Herbert
fe99d4e984 Standardise parameter naming across all file IO methods 2021-12-02 17:19:53 +09:00
Dean Herbert
ae3038ead4 Overwrite existing files if AddFile is called with an existing filename 2021-12-02 17:18:06 +09:00
Dean Herbert
512818648f Add some more breathing room between tab control and queue content 2021-12-02 16:56:30 +09:00
Dean Herbert
5976982b12 Add missing xmldoc for MultiplayerClient events 2021-12-02 16:45:26 +09:00
Dan Balasescu
c00684a2f7
Merge branch 'master' into new-multiplayer-playlist 2021-12-02 16:19:34 +09:00
Dan Balasescu
b2a83f0ab9
Merge pull request #15894 from peppy/combine-similarly-named-tests
Combine similarly named `StatefulMultiplayerClient` tests
2021-12-02 15:30:39 +09:00
Dean Herbert
0adfb75cf3 Combine similarly named StatefulMultiplayerClient tests 2021-12-02 14:53:07 +09:00
Dean Herbert
bdddaba352 Remove unnecessary test request handling 2021-12-02 14:33:56 +09:00
Dean Herbert
624ec4580a Ensure updateLocalRoomSettings is only called after full population 2021-12-02 14:32:39 +09:00
Dean Herbert
5cc798b1c5 Merge branch 'realm-integration/skins-rebase' into realm-integration/skins-filename-lookup-performance 2021-12-02 14:02:02 +09:00