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

40504 Commits

Author SHA1 Message Date
Dean Herbert
6fa7b4f552
Merge branch 'master' into hp-drain-v1-2 2023-11-17 18:33:03 +09:00
Dean Herbert
b88e3cd26f
Change ResourceStore provided to Skin to be a fallback, not replacement 2023-11-16 20:19:01 +09:00
Dean Herbert
87a76b9ee8
Merge pull request #25478 from Joehuu/fix-comment-markdown
Fix `CommentMarkdownTextFlowContainer` not inheriting osu! class
2023-11-16 17:39:35 +09:00
Dean Herbert
0a8ede6274
Merge pull request #25469 from Joehuu/argon-hide-counter-labels
Add ability to toggle labels on argon counter components
2023-11-16 17:01:03 +09:00
Bartłomiej Dach
1e2f1b3ef2
Merge branch 'master' into unload-main-menu-storyboard 2023-11-16 15:46:44 +09:00
Bartłomiej Dach
dbd4f26436
Use alternative method of scheduling storyboard unload 2023-11-16 15:37:53 +09:00
Dean Herbert
b45872d2e0
Merge branch 'master' into argon-hide-counter-labels 2023-11-16 14:20:13 +09:00
Dean Herbert
73eda6c09c
Move non-matching default value to argon skin default speficiation instead 2023-11-16 14:18:49 +09:00
Dean Herbert
39a3313929
Update tooltip description slightly 2023-11-16 14:11:01 +09:00
Joseph Madamba
dc2d574965 Fix comment markdown image not showing tooltips 2023-11-15 19:50:32 -08:00
Joseph Madamba
2b19cf6ce4 Fix comment markdown style regression 2023-11-15 19:50:32 -08:00
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
Joseph Madamba
62352ce5f3 Add ability to toggle labels on argon counter components 2023-11-14 20:46:42 -08:00
Joseph Madamba
87ace7565d Use existing localisation for argon counter component labels 2023-11-14 20:44:33 -08: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
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
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
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
Dan Balasescu
98e6b7744b
Cleanup 2023-11-13 13:46:47 +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
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
04a16b3596
Merge branch 'master' into gameplay-hud-redesign/counters 2023-11-11 22:38:39 +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
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
Dean Herbert
61d336521d
Update framework 2023-11-11 19:48:56 +09:00
Bartłomiej Dach
2428a97d44
Fix editor not clearing undo history on skin change 2023-11-11 18:49:44 +09:00
Salman Ahmed
96da7a07bb Add detailed explaination on existence of ScheduleUntilTransitionEnd 2023-11-11 02:57:29 +03:00
Salman Ahmed
bb912bc616 Avoid spinning another load thread on initial storyboard load 2023-11-11 02:57:17 +03:00
Salman Ahmed
080f13e34d Schedule outside of UnloadStoryboard and fix disposal happening on update thread 2023-11-11 02:56:45 +03: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
Dan Balasescu
fecc6f580b
Add legacy reference health processor 2023-11-10 18:40:21 +09:00