1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Commit Graph

63672 Commits

Author SHA1 Message Date
Dean Herbert
a745642f76
Fix customised argon skins no longer loading due to incorrect resource store spec 2023-11-14 22:01:56 +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
ec2200d54f
Remove another reference to bar length 2023-11-10 18:26:08 +09:00
Bartłomiej Dach
26eae0bdee
Remove unused using directive 2023-11-10 18:25:39 +09:00
Bartłomiej Dach
43a4b34295
Fix typo 2023-11-10 18:20:14 +09:00
Bartłomiej Dach
c522a703eb
Merge branch 'master' into skin-size-editing 2023-11-10 18:19:27 +09:00
Bartłomiej Dach
374e13b496
Remove argon health display bar length setting
It is no longer needed.

Intentionally not doing backwards migration to simplify things; users
can fix their skins.
2023-11-10 18:18:58 +09:00
Bartłomiej Dach
2c1f304f3b
Fix test failures due to fluctuations in needlessly-serialised automatic sizings 2023-11-10 18:13:36 +09:00
Dean Herbert
1c63f1f89d
Merge pull request #25348 from bdach/less-basic-touchscreen-detection
Implement basic touchscreen detection
2023-11-10 18:01:40 +09:00
Dean Herbert
35e11c7c63
Rename diagonal scale variable and update xmldoc 2023-11-10 17:55:02 +09:00
Dean Herbert
f25489cc7b
Check X/Y sizing available separately to fix weird edge cases 2023-11-10 17:54:43 +09:00
Dean Herbert
46a219e010
Add comment explaining AutoSize change in LegacySongProgress 2023-11-10 17:53:52 +09:00
Dean Herbert
74ccb0873e
Merge pull request #25403 from smoogipoo/attempt-fix-diffcalc-quotes
Attempt to support quotes in handling of GH comment body
2023-11-10 16:59:17 +09:00
Dean Herbert
a02aeed50a
Adjust combo animation slightly 2023-11-10 16:53:16 +09:00
Dean Herbert
67312a2db9
Remove ArgonScoreWedge and use ArgonWedgePiece directly 2023-11-10 16:53:16 +09:00
Dean Herbert
b4ec62473e
Remove width/height bindables from ArgonWedgePiece 2023-11-10 16:53:15 +09:00
Dean Herbert
fa5921862f
Update deserialising test 2023-11-10 16:53:15 +09:00
Bartłomiej Dach
b7938e78a0
Make sure test is in a break
...because apparently it may take a while to update the flag.
2023-11-10 16:30:44 +09:00
Dean Herbert
7c4e9506da
Merge pull request #25399 from Susko3/mobile-touch-settings
Show touch input settings on mobile
2023-11-10 16:25:01 +09:00
Dean Herbert
7db14baed7
Update resources 2023-11-10 16:20:05 +09:00
Dean Herbert
60df2722ab
Rename RoundedLine to BoxElement and make more generically useful 2023-11-10 16:20:05 +09:00