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

47196 Commits

Author SHA1 Message Date
Dan Balasescu
9e3a1c75d2
Merge pull request #16000 from peppy/fix-legacy-combo-counter-anchor
Fix `LegacyComboCounter` not handling non-default anchor/origin specifications correctly
2021-12-08 16:00:06 +09:00
Dan Balasescu
99991a6703 Minor cleanups, unifying wording a bit more 2021-12-08 15:59:15 +09:00
Dan Balasescu
1a09a3469a Merge branch 'master' into refactor-osu-difficulty-hit-object 2021-12-08 15:53:44 +09:00
Dan Balasescu
11104124f1 Restructure doc for easier readability 2021-12-08 15:52:59 +09:00
Dean Herbert
872e0884c0 Fix the local user's rank not showing on multiplayer/playlist results screen
Applying the simple solution for now. Not sure how this will evolve over
time, but seems sane enough.
2021-12-08 15:22:10 +09:00
Dan Balasescu
814f072767 Use new LazyJumpDistance terminology in documentation 2021-12-08 15:17:56 +09:00
Dean Herbert
6ec3f41839 Fix LegacyComboCounter not handling non-default anchor/origin specifications correctly 2021-12-08 15:07:15 +09:00
Dan Balasescu
7c0f7b1baa Use "x" for cursor position in diagrams 2021-12-08 14:57:21 +09:00
Dean Herbert
0775053a18 Fix the unmute notification potentially overwriting user's volume levels unnecessarily
I've also changed the cutoffs to 5% rather than zero, as this seems like
a saner method of showing this dialog. With levels 5% or less, the game
is basically inaudible.

Arguably, the cutoff can be increased to 10%.
2021-12-08 13:38:43 +09:00
Dean Herbert
a969fe3ef8 Add test coverage showing intended UX of user's volume levels being retained when unmuting 2021-12-08 13:37:47 +09:00
Dean Herbert
724d72b975
Merge pull request #15988 from bdach/fix-team-versus-test-failure
Fix test failures in team versus test
2021-12-08 11:54:00 +09:00
Dean Herbert
2e640ff2ad
Merge pull request #15989 from bdach/fix-editor-clipboard-test-failure
Fix editor crashing if paste is performed while composer is loading
2021-12-08 11:18:59 +09:00
Dean Herbert
f86931b66f
Merge pull request #15978 from peppy/beatmap-card/scale-on-hover
Scale card when expanding to better distinguish hovered card from other cards in listing
2021-12-08 11:18:07 +09:00
Salman Ahmed
fea3b9d7a9 Disable minimum frame durations on osu! for iOS 2021-12-08 04:43:02 +03:00
Bartłomiej Dach
7720a1b69b
Fix test to wait for drawable ruleset load before attempting paste 2021-12-07 21:10:45 +01:00
Bartłomiej Dach
10dd64e07c
Fix being able to paste objects while composer is loading
Would lead to exceptions due to modification of `Beatmap.HitObjects`
during its enumeration by `DrawableRuleset`, which was happening as an
async load via `EditorScreenWithTimeline.CreateMainContent()`.
2021-12-07 21:00:25 +01:00
Bartłomiej Dach
e9694dc74e
Wait for match type changes in team versus test 2021-12-07 20:40:10 +01:00
Bartłomiej Dach
8b7ed759e3
Merge branch 'master' into beatmap-card/scale-on-hover 2021-12-07 19:11:01 +01:00
Dan Balasescu
74db8da11b
Merge pull request #15758 from GoldenMine0502/speedbug
Make speed skill consider only the shortest movement distance
2021-12-08 01:31:07 +09:00
Dan Balasescu
86eacfdbd8
Merge pull request #15879 from peppy/multiplayer-delayed-playlist-load-broken
Load playlist panels on demand to reduce initial load time when joining a room
2021-12-08 00:42:20 +09:00
Dean Herbert
25a0505c97 Scale card when expanding to better distinguish hovered card from other cards in listing 2021-12-07 23:48:14 +09:00
Dan Balasescu
bcda777071
Merge branch 'master' into speedbug 2021-12-07 23:43:17 +09:00
Dean Herbert
d6e68feadc
Merge pull request #15948 from bdach/beatmap-card/difficulty-dropdown
Add difficulty dropdown to beatmap card
2021-12-07 23:40:06 +09:00
Dan Balasescu
7e236c3a41 Remove unused dependency 2021-12-07 23:36:48 +09:00
Dan Balasescu
ded86282c1 Rename + better documentation 2021-12-07 23:14:35 +09:00
Dan Balasescu
52230a6f00
Merge branch 'master' into multiplayer-delayed-playlist-load-broken 2021-12-07 22:45:05 +09:00
Dean Herbert
a8c20368c0
Merge pull request #15976 from smoogipoo/add-modes-to-room-panels
Add match type and queue mode to multiplayer room panels
2021-12-07 22:08:30 +09:00
Dan Balasescu
7c3d1d630e Merge branch 'master' into refactor-osu-difficulty-hit-object 2021-12-07 21:05:49 +09:00
Dan Balasescu
4683193f09 Move implementation to base class 2021-12-07 20:36:39 +09:00
Dan Balasescu
4078372480
Merge pull request #15975 from peppy/update-framework
Update framework
2021-12-07 19:23:16 +09:00
Dan Balasescu
5ffe702dd6 Add match type and queue mode to multiplayer room panels 2021-12-07 18:57:13 +09:00
Dean Herbert
9978caab12 Update framework 2021-12-07 18:37:30 +09:00
Dan Balasescu
08dac3fcda
Merge pull request #15974 from peppy/fix-participant-list-state-desync
Fix multiplayer user panels potentially getting out of sync with player's state
2021-12-07 18:01:11 +09:00
Dean Herbert
dea7f2308c Fix participant panels potentially keeping a reference to an old user
If a user leave and then rejoins a multiplayer match while another user
is not at the lobby screen, there is a potential the `ParticipantPanel`
tracking the user will not correctly be recreated to reference the new
instance of the `MultiplayerUser`.

This happens because the `OnRoomUpdated` call is scheduled, which means
it is not running in the background, coupled with the local logic that
relies on `IEquatable(MultiplayerRoomUser)` (which in turn falls back to
a UserID comparison).

Changing this to a reference comparison is the easiest way to resolve
this. Whether we change the `IEquatable` implementation is up for
discussion.

Closes https://github.com/ppy/osu/issues/15970.
2021-12-07 17:24:04 +09:00
Dan Balasescu
9f77529e35
Merge pull request #15972 from peppy/cancellation-woes
Fix `GetPlayableBeatmap` timeout not being applied when no `CancellationToken` is provided to difficulty calculations
2021-12-07 14:31:56 +09:00
Dean Herbert
cfa712473d Use default timeout in GetPlayableBeatmap when provided CancellationToken is default 2021-12-07 13:33:41 +09:00
Dean Herbert
f3e9fb76fc Add the ability to pass a CancellationToken through DifficultyCalculator.CalculateAll
Was weirdly missing from this one method.
2021-12-07 13:32:47 +09:00
Dean Herbert
a62beb3c59
Merge pull request #15968 from frenzibyte/move-log-to-network
Move API request response size log to correct logging target
2021-12-07 10:32:53 +09:00
Salman Ahmed
974987550f Move API request response size log to correct logging target 2021-12-07 04:01:56 +03:00
Dean Herbert
8dc76964a3
Merge pull request #15959 from bdach/fix-skins-resetting
Fix skin setting resetting every launch
2021-12-07 09:34:17 +09:00
Bartłomiej Dach
999bba439f
Clarify usages of reverse child ID flow with inline comments 2021-12-06 21:02:40 +01:00
Bartłomiej Dach
82ed8eae6b
Ensure hover handling container always calls base on hover events 2021-12-06 21:02:40 +01:00
Bartłomiej Dach
ccfc361626
Apply naming suggestions 2021-12-06 21:02:38 +01:00
Bartłomiej Dach
4278a320e4
Fix skin setting resetting every launch
The reason this was happening was an unfortunate oversight in the
migration logic. The code that was attempting to parse the skin settings
as `int` was firing regardless of whether a skin migration from EF to
realm had already occurred. If it had occurred, the skin setting would
contain a GUID rather than an integer, and therefore fail to parse, and
therefore implicitly fallback to a EF skin ID of 0 which would be the
default skin.

Fix by not running the setting migrating logic at all when there are no
EF skins to migrate.
2021-12-06 20:12:02 +01:00
Dean Herbert
79b8cb41f2
Merge pull request #15953 from smoogipoo/update-test-multiplayer-client
Update test multiplayer client implementation
2021-12-07 01:15:28 +09:00
Dan Balasescu
d5cdb1bb87 Update test multiplayer client implementation 2021-12-07 00:01:07 +09:00
Dean Herbert
91ff20a610
Merge pull request #15952 from peppy/update-framework
Update framework
2021-12-06 23:37:12 +09:00
Dean Herbert
3e27859e4f Update framework 2021-12-06 22:47:07 +09:00
Dan Balasescu
7ef960839b
Merge pull request #15898 from peppy/skin-export-instntiation-info
Serialise and deserialise `SkinInfo.InstantiationInfo` to allow for more correct imports
2021-12-06 22:08:20 +09:00
Dean Herbert
9033169177
Merge pull request #15951 from peppy/fix-failing-recorder-tests-w
Fix intermittent test failures in scenes using `SpectatorClient`
2021-12-06 18:40:27 +09:00