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

9298 Commits

Author SHA1 Message Date
Dean Herbert
67a8a51ec7
Merge branch 'master' into generic-error-sfx 2023-10-14 03:56:41 +09:00
Jamie Taylor
d97b618d02
Use new generic-error sample in appropriate places 2023-10-13 21:06:50 +09:00
Dean Herbert
3d5736188e
Merge pull request #25112 from bdach/dangerous-button-shades
Fix dangerous buttons using different shades of pink
2023-10-13 20:43:24 +09:00
Bartłomiej Dach
af89d69fc4
Fix dangerous buttons using different shades of pink 2023-10-13 13:16:24 +02:00
Bartłomiej Dach
a88779e588
Use dimmed placeholder text instead of empty box on cleared bindings 2023-10-13 13:10:04 +02:00
Dean Herbert
6358a5e210
Merge pull request #25105 from bdach/multiple-keys-one-binding
Disallow binding multiple bindings in a single section to one key
2023-10-13 20:01:33 +09:00
Bartłomiej Dach
a1c68b66f2
Rename KeyBindingRow parts to appease CodeFileSanity 2023-10-13 12:06:25 +02:00
Dean Herbert
17b6ebbfbf
Avoid using a bindable in KeyBindingConflictPopover where data is never mutated 2023-10-13 18:40:21 +09:00
Dean Herbert
9b0c4acdef
Split KeyBindingRow out into partial pieces 2023-10-13 18:29:06 +09:00
Dean Herbert
8e609b6f1d
Switch records to classes for sanity
I don't have anything against records except for the capitalisation when
including the paramter names in a constructor.

ie. `new Record(This: 1);`
2023-10-13 18:19:12 +09:00
Bartłomiej Dach
d5557bbbfb
Merge pull request #25005 from minetoblend/multiplayer-invites
Add ability to invite players to multiplayer rooms
2023-10-13 11:09:28 +02:00
Dean Herbert
d7a06059f2
Rename string properties to give more hinting to localisers 2023-10-13 17:49:48 +09:00
Bartłomiej Dach
e04a57d67f
Use less dodgy method of specifying allowable notification types 2023-10-13 10:31:00 +02:00
Bartłomiej Dach
61b8d035fe
Use dangerous colour for "apply new" button 2023-10-13 09:08:13 +02:00
Bartłomiej Dach
f083309e64
Move type back next to exposing class 2023-10-12 20:26:01 +02:00
Bartłomiej Dach
f1c1ffbdfd
Add localisation support 2023-10-12 20:26:01 +02:00
Bartłomiej Dach
08bdea0036
Reformat code 2023-10-12 20:26:01 +02:00
Bartłomiej Dach
991e425b9a
Refactor conflict handling flow to be less back-and-forth 2023-10-12 20:25:59 +02:00
Bartłomiej Dach
9468371556
Fix min width not really working as intended 2023-10-12 16:04:46 +02:00
Bartłomiej Dach
b09252a8f8
Fix restore-to-default button for entire section triggering conflicts 2023-10-12 16:04:46 +02:00
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
Dean Herbert
56e27f1c27
Merge branch 'master' into multiplayer-invites 2023-10-12 18:17:15 +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
55a9de034d
Change NotificationOverlay type based logic to not require specifying every type of notification 2023-10-12 16:00:23 +09:00
Bartłomiej Dach
712564ea4f
Enable NRT in KeyBindingsSubsection 2023-10-11 20:03:31 +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
Marvin Schürz
fe5177fa4f Remove unused import 2023-10-04 00:50:48 +02:00
Marvin Schürz
32f69cd0ba Make UserAvatarNotification.user readonly 2023-10-04 00:20:07 +02:00
Marvin Schürz
e81695bcac Display avatar in invitation notification 2023-10-02 23:10:51 +02:00
Bartłomiej Dach
9a49f44db0
Use AsOrdered() when presenting mod presets too 2023-09-28 18:42:05 +02:00
Bartłomiej Dach
c0728f0b2e
Replace local sort with new utility method 2023-09-28 18:35:15 +02:00
Bartłomiej Dach
8215c4cb0e
Merge branch 'master' into mods-stable-ordering 2023-09-28 18:30:56 +02:00
Dean Herbert
7d74d84e6c Display mod icons using stable ordering
In discussion with nanaya, we likely want this now that we're adding the
ability for some icons to be extended. Historically mod icons have been
displayed in a stable but arbitrary order (based on their position in
the `Mods` enum).

This change aims to make them stable across lazer scores (where they are
stored based on .. the order the user selected them).
2023-09-28 16:48:09 +09:00
Dean Herbert
7908b36b39 Flash dialog popup when attempting to exit editor while exit is being blocked 2023-09-28 15:25:39 +09:00
NiceAesth
83bf1efc1c Add color search alias for colour settings 2023-09-27 16:29:29 +03:00
Bartłomiej Dach
3bddf4bf9a
Rename spectator-specific settings to more generic (with backwards migration) 2023-09-18 14:56:06 +02:00
Bartłomiej Dach
2709c6cd67
Integrate nano beatmap card into the notification 2023-09-18 14:56:06 +02:00
Bartłomiej Dach
5c2413c06b
Implement nano beatmap card 2023-09-18 11:30:14 +02:00
Bartłomiej Dach
6aff1d4063
Merge branch 'master' into mod-select-difficulty-multiplier-animation 2023-09-14 16:23:30 +02:00
Bartłomiej Dach
94cdcfd7ce
Move collapsed bindable back to BeatmapAttributesDisplay for now
Better to have it only in one place that needs it, rather than have it
not work as expected when someone inherits
`ModFooterInformationDisplay`.
2023-09-14 14:56:58 +02:00