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

63708 Commits

Author SHA1 Message Date
Dean Herbert
7f90db7603
Merge pull request #25472 from bdach/argon-health-folding-in-on-self
Fix argon health bar folding in on itself when too narrow
2023-11-15 19:02:30 +09:00
Dean Herbert
2987c0e802
Add note about enfocing size methodology 2023-11-15 19:01:52 +09:00
Dean Herbert
189fca2eb6
Merge pull request #25339 from joshika39/change-clickable-avatars-tooltip-for-usergrid
Add `UserGridPanel` as the `ClickableAvatar` tooltip
2023-11-15 18:01:24 +09:00
Joseph Madamba
7b987266d5
Change behavior of some clickable avatars in line with web 2023-11-15 17:22:36 +09:00
Joshua Hegedus
deef8998f7
reverted the change 2023-11-15 17:22:36 +09:00
Joshua Hegedus
aa9deecafe
added missing comment, fixed incorrect visibility 2023-11-15 17:22:36 +09:00
Bartłomiej Dach
8cd1f08a92
Fix argon health bar folding in on itself 2023-11-15 15:42:45 +09:00
Bartłomiej Dach
71714f8f6e
Add back test step for testing out argon health bar width 2023-11-15 13:33:14 +09:00
Dean Herbert
10be233562
Merge pull request #25466 from bdach/argon-health-initial-width
Fix default argon health bar width being zero
2023-11-15 13:30:36 +09:00
Bartłomiej Dach
159cf41f82
Fix default argon health bar width being zero
Closes #25460.
2023-11-15 12:53:09 +09:00
Dean Herbert
3b619d4c34
Merge pull request #25458 from Joehuu/corner-radius-localisation 2023-11-15 11:10:59 +09:00
Dean Herbert
2264e1e249
Change default value and range of BoxElement's corner radius to match other usages 2023-11-15 10:45:01 +09:00
Dean Herbert
74fb1b5f81
Rename property to match expctations 2023-11-15 10:40:59 +09:00
Joseph Madamba
535282ba7d Use existing localisation for corner radius in BoxElement 2023-11-14 14:13:20 -08:00
Bartłomiej Dach
711bf14c06
Merge pull request #25443 from peppy/fix-argon-custom-skins
Fix customised argon skins no longer loading due to incorrect resource store specification
2023-11-14 23:11:39 +09:00
Dean Herbert
6e0375e3e8
Merge pull request #25442 from bdach/argon-health-bar-sizing-broken
Fix argon health bar not relative sizing correctly
2023-11-14 23:10:03 +09:00
Dean Herbert
9a7d7dda2a
Update resources 2023-11-14 23:04:11 +09:00
Dean Herbert
a745642f76
Fix customised argon skins no longer loading due to incorrect resource store spec 2023-11-14 22:01:56 +09:00
Bartłomiej Dach
83f8f03c7e
Fix argon health bar not relative sizing correctly 2023-11-14 21:54:06 +09:00
Dean Herbert
572ec918d6
Merge pull request #25432 from bdach/touch-device-fixes
Fix some touch device-related issues
2023-11-14 17:18:38 +09:00
Bartłomiej Dach
70d2de5669
Move song select touch detector to solo implementation
It should not run in multiplayer. Even if we wanted to allow touch-only
playlist items at some point, the current behaviour of multiplayer song
selects with respect to touch device mod is currently just broken.
2023-11-14 16:35:16 +09:00
Bartłomiej Dach
69c2c0e427
Fix touch device mod declared valid for multiplayer
Mostly matters for web, so that it doesn't permit creation of playlist
items with touch device inside.
2023-11-14 16:30:10 +09:00
Bartłomiej Dach
bb2f38d189
Merge pull request #25411 from peppy/fix-key-counter-sizing-woes
Refactor `KeyCounterDisplay` to use autosize
2023-11-12 20:47:55 +09:00
Dean Herbert
469b9e2546
Increase size and adjust positioning of max combo display in argon skin 2023-11-12 17:28:15 +09:00
Bartłomiej Dach
7d26de723a
Merge branch 'master' into fix-key-counter-sizing-woes 2023-11-12 17:23:31 +09:00
Dean Herbert
31feeb5ddc
Disable new rider EAP inspection in test class 2023-11-12 17:21:17 +09:00
Dean Herbert
798e677c09
Refactor KeyCounterDisplay to use autosize
A previous attempt at this was unsuccessful due to a partially
off-screen elements not getting the correct size early enough (see
https://github.com/ppy/osu/issues/14793). This can be accounted for by
setting `AlwaysPresent` when visibility is expected.

This fixes [test failures](https://github.com/ppy/osu/actions/runs/6838444698/job/18595535795)
due to the newly added `Width` / `Height` being persisted with
floating-point errors (by not persisting the values in the first place,
via `AutoSize.Both`).
2023-11-12 17:19:25 +09:00
Dean Herbert
b995c96dca
Merge pull request #25226 from frenzibyte/gameplay-hud-redesign/counters 2023-11-12 12:14:26 +09:00
Bartłomiej Dach
3e8c89e282
Fix one more reference to removed setting 2023-11-12 07:42:41 +09:00
Bartłomiej Dach
c3201d5944
Merge branch 'master' into gameplay-hud-redesign/counters 2023-11-12 07:33:50 +09:00
Bartłomiej Dach
ccfdf1ffd6
Merge pull request #25402 from peppy/skin-size-editing
Add support for adjusting size of skin elements
2023-11-12 07:31:51 +09:00
Dean Herbert
04a16b3596
Merge branch 'master' into gameplay-hud-redesign/counters 2023-11-11 22:38:39 +09:00
Bartłomiej Dach
c5bbd5ac8a
Merge pull request #25408 from peppy/skin-editor-export
Add "export" item to skin editor menu
2023-11-11 21:48:21 +09:00
Bartłomiej Dach
ea556abad8
Merge branch 'skin-size-editing' into gameplay-hud-redesign/counters 2023-11-11 21:28:29 +09:00
Bartłomiej Dach
50789d2e18
Fix song progress bars not sizing vertically properly 2023-11-11 21:28:04 +09:00
Bartłomiej Dach
ee56b4d205
Use barely better assertion fail message in test 2023-11-11 20:56:05 +09:00
Bartłomiej Dach
870e4ce27e
Fix argon health display not handling invalidation correctly 2023-11-11 20:42:45 +09:00
Dean Herbert
b0aa4a4257
Add "export" item to skin editor menu 2023-11-11 20:34:35 +09:00
Bartłomiej Dach
b7972e3c84
Merge branch 'skin-size-editing' into gameplay-hud-redesign/counters 2023-11-11 20:16:14 +09:00
Dean Herbert
ed59a379f1
Merge pull request #25407 from peppy/update-framework
Update framework
2023-11-11 20:15:07 +09:00
Bartłomiej Dach
8d7539ab70
Merge branch 'master' into skin-size-editing 2023-11-11 19:56:09 +09:00
Bartłomiej Dach
4b3fd1716a
Merge pull request #25406 from bdach/skin-editor-bad
Fix skin editor not clearing undo history on skin change
2023-11-11 19:55:04 +09:00
Dean Herbert
61d336521d
Update framework 2023-11-11 19:48:56 +09:00
Bartłomiej Dach
b247b94ecb
Revert test changes
They were broken because `SerialisedDrawableInfo` is a reference type
and as such equality checks will use reference equality rather than
member equality.
2023-11-11 19:32:46 +09:00
Bartłomiej Dach
2428a97d44
Fix editor not clearing undo history on skin change 2023-11-11 18:49:44 +09:00
Bartłomiej Dach
21e1d68b15
Remove unused using directive 2023-11-11 15:52:24 +09:00
Dean Herbert
2e48569982
Improve test comparison logic
Doesn't really help that much with nunit output,
but at least you can breakpoint and see the json kinda.
2023-11-10 20:00:51 +09:00
Dean Herbert
57cd5194ce
Flip comparison to allow non-composite drawables to still get resized 2023-11-10 20:00:20 +09:00
Bartłomiej Dach
b7acbde719
Only store width/height of serialised drawable if it isn't automatically computed 2023-11-10 19:12:26 +09:00
Bartłomiej Dach
b6dcd7d55f
Fix tests so that they actually assert something 2023-11-10 18:48:45 +09:00