1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 17:17:24 +08:00
Commit Graph

63080 Commits

Author SHA1 Message Date
Bartłomiej Dach
f5a6781e5a
Integrate key binding conflict popover into keybindings panel 2023-10-12 16:04:46 +02:00
Bartłomiej Dach
7b6563116a
Implement visual appearance of key binding conflict popover 2023-10-12 16:01:51 +02:00
Bartłomiej Dach
aa8dbd742e
Hoist database update to subsection level
The end goal here is to be able to better coordinate deconfliction of
bindings at the subsection level rather than try to jam that logic into
individual rows somehow.

The flipside is that this is going to require a flow to update the
individual rows after the subsection's intervention, but that's what the
previous commit was for.
2023-10-12 16:01:51 +02:00
Bartłomiej Dach
5f0b1d69a5
Prepare KeyBindingRow for accepting external changes 2023-10-12 16:00:20 +02:00
Bartłomiej Dach
c2e92cbb70
Refactor key binding panel leveraging new helper methods 2023-10-12 15:03:29 +02:00
Bartłomiej Dach
1c784c9abe
Add API for retrieving global key bindings per section 2023-10-12 14:24:21 +02:00
Bartłomiej Dach
2a0e4c364d
Add method to unmap RealmKeyBinding.Action to actual enum-typed value 2023-10-12 14:17:26 +02:00
Dean Herbert
3849b11644
Fix "Hard Rock" mod affecting CS/AR in osu!mania
Closes https://github.com/ppy/osu/issues/25090.

Not sure if there are other exceptions we should account for here.
2023-10-12 19:48:47 +09:00
Dean Herbert
fa47309eef
Fix exit key during storyboard outro not progressing to results 2023-10-12 19:31:54 +09:00
Dean Herbert
d174a6ce61
Remove dead code which was only there for the exit-specific scenario 2023-10-12 19:27:35 +09:00
Dean Herbert
45db4ab412
Merge pull request #25100 from bdach/large-tick-mania-begone
Remove remaining usages of `LargeTick{Hit,Miss}` in mania
2023-10-12 19:13:10 +09:00
Dean Herbert
32eda99c3a
Add missing xmldoc returns 2023-10-12 19:06:34 +09:00
Dean Herbert
1ce268be3f
Update some packages to match osu.Server.Spectator 2023-10-12 18:58:42 +09:00
Bartłomiej Dach
34bab38e80
Fix judgement counter test failure due to exploiting mania ruleset
Large ticks are not a thing in mania anymore, so the judgement counter
tests began to fail as `LargeTickHit` is no longer a valid hit result
in that ruleset.
2023-10-12 11:34:59 +02:00
Dean Herbert
fc1287b4c6
Reword xmldoc on invite method to better describe what is happening 2023-10-12 18:25:20 +09:00
Dean Herbert
56e27f1c27
Merge branch 'master' into multiplayer-invites 2023-10-12 18:17:15 +09:00
Bartłomiej Dach
a42e75452e
Remove remaining usages of LargeTickHit in mania 2023-10-12 11:16:51 +02:00
Dean Herbert
e48c4fa430
Add missing ConfigureAwait calls 2023-10-12 18:15:15 +09:00
Dean Herbert
a591af2b97
Fix too many tasks in lookupRoom method 2023-10-12 18:11:04 +09:00
Dean Herbert
5f62c225bf
Ad localisation (and adjust messaging) of invite failures 2023-10-12 18:07:03 +09:00
Dean Herbert
361d70f68a
Rename callback to match standards 2023-10-12 17:59:47 +09:00
Dean Herbert
d2aa601912
Allow localisation of the invite notification 2023-10-12 17:59:08 +09:00
Dean Herbert
a1a9bb75b7
Remove unnecessary schedule logic 2023-10-12 17:55:58 +09:00
Dean Herbert
cde4fad610
Simplify async lookup logic in Invited handling 2023-10-12 17:55:14 +09:00
Dean Herbert
94d7a65e40
Schedule Join operations rather than using OnLoadComplete for added safety 2023-10-12 17:42:02 +09:00
Dean Herbert
a512ef5637
Add exceptions to online state handling 2023-10-12 17:41:31 +09:00
Dean Herbert
20f32e2025
Add light colouring for user notifications and adjust lighting slightly 2023-10-12 16:06:06 +09:00
Dean Herbert
aee8ba789c
Tidy up UserAvatarNotification implementation 2023-10-12 16:06:06 +09:00
Dean Herbert
e6103fea95
Fix async usage in TestSceneNotificationOverlay 2023-10-12 16:00:36 +09:00
Dean Herbert
55a9de034d
Change NotificationOverlay type based logic to not require specifying every type of notification 2023-10-12 16:00:23 +09:00
Dean Herbert
3023e44196
Remove unused using statements 2023-10-12 15:52:48 +09:00
Dean Herbert
73b8146729
Update tests in line with new behaviour 2023-10-12 15:42:54 +09:00
Dean Herbert
242a41371c
Fix HotkeyOverlay fade out occurring when exit is blocked 2023-10-12 15:42:54 +09:00
Dean Herbert
7c0d496730
Show results immediately if user hits "back" key after finishing gameplay
I've gone ahead and matched the osu!stable behaviour for this, as it
seems like it's what people are used to and they will settle for no
less.

Closes https://github.com/ppy/osu/issues/18089.
2023-10-12 15:42:23 +09:00
Dean Herbert
256c95f045
Add (failing) test coverage of exit/retry during progress to results 2023-10-12 15:42:20 +09:00
Dean Herbert
d2044fc2cc
Merge pull request #25082 from peppy/test-scene-background
Remove test scene background stack and use new `ChangeBackgroundColour`
2023-10-12 14:57:34 +09:00
Dean Herbert
5bb73632c4
Show maximum bonus statistics on results screen
Addresses https://github.com/ppy/osu/discussions/25088.
2023-10-12 14:55:16 +09:00
Dean Herbert
194ad9650d
Remove test scene background stack and use new ChangeBackgroundColour method 2023-10-12 14:08:31 +09:00
Dean Herbert
29eba3c58a
Update framework 2023-10-12 14:08:31 +09:00
Dean Herbert
f26e3afd29
Merge pull request #25062 from smoogipoo/remove-hold-note-ticks
Remove osu!mania hold note ticks
2023-10-12 13:55:50 +09:00
Dean Herbert
52255b15f0
Merge pull request #25092 from bdach/key-binding-row-cleanups
Clean up `KeyBindingRow` and related classes
2023-10-12 13:38:52 +09:00
Joseph Madamba
764f641bc9 Add extended info support to tiny mod switches 2023-10-11 12:47:12 -07:00
Bartłomiej Dach
712564ea4f
Enable NRT in KeyBindingsSubsection 2023-10-11 20:03:31 +02:00
Bartłomiej Dach
063623b4e6
Merge branch 'master' into remove-hold-note-ticks 2023-10-11 19:47:51 +02:00
Bartłomiej Dach
041318e3e8
Assign red colour to ComboBreak hit result
For a judgement result to show up on the colour hit error meter, it has
to be two things: be scorable, and not be bonus.

`ComboBreak` happens to meet both of those criteria - it impacts score
indirectly via decreasing the combo portion, and isn't bonus. Therefore
it would show up on the colour hit error meter, but because
`OsuColour.ForHitResult()` wasn't handling it explicitly, it was
painting the result in light blue, which isn't ideal for a miss type
judgement. Therefore, use red instead.

There is possibly an argument to be made that this judgement should not
show up on the colour hit error meter at all, but I think it's actually
okay for it to be this way. In any case it doesn't appear to be anything
so major as to warrant blocking the hold note tick removal at this time.
2023-10-11 19:44:46 +02:00
Bartłomiej Dach
3f29f27cd4
Assign empty hit windows to HoldNoteBody
It's not a timed object, so following precedent, it should have empty
hitwindows.

This is not actually just aesthetics; several components check whether a
hitobject has empty hitwindows to determine whether to include it on
various HUD displays and results screen components where timed objects
are explicitly involved.
2023-10-11 19:40:55 +02:00
Bartłomiej Dach
797109c05c
Enable NRT in KeyBindingRow 2023-10-11 08:50:00 +02:00
Bartłomiej Dach
0b2b065383
Add xmldoc 2023-10-11 08:50:00 +02:00
Bartłomiej Dach
7ac874d17a
Use init-only properties where applicable 2023-10-11 08:49:58 +02:00
Bartłomiej Dach
1acc02405e
Reorder KeyBindingRow members 2023-10-11 08:18:59 +02:00