1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 01:23:05 +08:00
Commit Graph

63076 Commits

Author SHA1 Message Date
Dean Herbert
54722bf251
Merge pull request #25113 from nekodex/generic-error-sfx
Use new `generic-error` sample in appropriate places
2023-10-14 04:35:12 +09:00
Dean Herbert
67a8a51ec7
Merge branch 'master' into generic-error-sfx 2023-10-14 03:56:41 +09:00
Dean Herbert
3cb9945545
Merge pull request #25101 from peppy/fix-hr-cs-mania-adjustment
Fix "Hard Rock" mod affecting CS/AR in osu!mania and osu!taiko
2023-10-14 03:56:24 +09:00
Dean Herbert
d4627a2402
Update resources 2023-10-14 03:48:59 +09:00
Bartłomiej Dach
8a4c2624bd
Merge branch 'master' into fix-hr-cs-mania-adjustment 2023-10-13 16:08:54 +02:00
Dean Herbert
c372f11013
Merge pull request #25115 from bdach/fix-keybinding-test-failures
Fix key binding panel test failures from introducing placeholder text
2023-10-13 22:50:58 +09:00
Bartłomiej Dach
9b474b656d
Fix key binding panel test failures from introducing placeholder text
Whoops.
2023-10-13 15:03:41 +02:00
Bartłomiej Dach
4e1d564d70
Merge pull request #25110 from peppy/limit-extra-elements
Apply a few more object sizing limits
2023-10-13 14:57:36 +02:00
Bartłomiej Dach
c762241268
Merge branch 'master' into fix-hr-cs-mania-adjustment 2023-10-13 14:08:05 +02:00
Jamie Taylor
d97b618d02
Use new generic-error sample in appropriate places 2023-10-13 21:06:50 +09:00
Bartłomiej Dach
d656306692
Remove approach rate adjustment from TaikoModHardRock
Approach rate does nothing in taiko.
2023-10-13 14:05:43 +02: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
Dean Herbert
7ac2a1721c
Merge pull request #25106 from bdach/dimmed-placeholder-empty-binding
Use dimmed placeholder text instead of empty box on cleared bindings
2023-10-13 20:43:02 +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
Bartłomiej Dach
ea766b792d
Update localisation keys to match localisable member names 2023-10-13 11:58:55 +02:00
Bartłomiej Dach
5f51b8a7c9
Merge pull request #25097 from peppy/results-screen-progress-fast
Show results immediately if user hits "back" key after finishing gameplay
2023-10-13 11:54:34 +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
Dean Herbert
850950ba61
Add note about why SmallBonus is not listed in GetValidHitResults 2023-10-13 17:36:30 +09:00
Dean Herbert
125f28219d
Fix hodl tail notes not correctly handling nested bonus judgement 2023-10-13 17:36:19 +09:00
Bartłomiej Dach
e04a57d67f
Use less dodgy method of specifying allowable notification types 2023-10-13 10:31:00 +02:00
Dean Herbert
94b64044e0
Add nested bonus judgement to DrawableNote for perfect bonus score 2023-10-13 17:01:48 +09:00
Bartłomiej Dach
79cec7707d
Privatise setter 2023-10-13 09:56:46 +02:00
Dean Herbert
3787348448
Change Perfect judgement to not give extra score 2023-10-13 16:29:02 +09:00
Bartłomiej Dach
61b8d035fe
Use dangerous colour for "apply new" button 2023-10-13 09:08:13 +02:00
Dean Herbert
0b64852181
Limit sliderscorepoint to hitcicle dimensions
You'd never use anything above this unless crazy.
2023-10-13 15:43:20 +09:00
Dean Herbert
17df2fdf01
Restrict followpoint size
See https://github.com/ppy/osu/issues/24940#issuecomment-1760980461.
2023-10-13 15:42:49 +09:00
Dean Herbert
37411f923e
Merge branch 'master' into multiple-keys-one-binding 2023-10-13 15:07:12 +09:00
Dean Herbert
7c36848eb1
Merge pull request #25104 from bdach/make-realm-key-binding-action-suck-less
Refactor key binding panel for easier usage
2023-10-13 14:27:07 +09:00
Dean Herbert
549a6581b0
Merge branch 'master' into make-realm-key-binding-action-suck-less 2023-10-13 13:53:24 +09:00
Dean Herbert
9289c47cd4
Tidy up GlobalActionContainer a bit 2023-10-13 13:47:51 +09:00
Dean Herbert
aabed8b6e5
Merge pull request #25093 from Joehuu/mod-switch-tiny-extended-info
Add extended info support to tiny mod switches
2023-10-13 13:40:24 +09:00
Bartłomiej Dach
6c8490bc7e
Revert changes to LoungeSubScreen.Join()
- `virtual` modifier was used in mocking.
- The spacing change revert is just mostly to keep it out of the final
  diff.
2023-10-12 20:39:40 +02:00
Bartłomiej Dach
edec10204e
Merge pull request #25096 from peppy/show-total-bonus
Show maximum bonus statistics on results screen
2023-10-12 20:29:28 +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
5d637520e7
Add test coverage for key binding conflict resolution 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