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

58759 Commits

Author SHA1 Message Date
Bartłomiej Dach
97afb83394
Merge branch 'master' into carousel 2023-02-03 22:15:44 +01:00
Bartłomiej Dach
c2be719107
Merge pull request #22502 from peppy/fix-skin-editor-padding-weirdness
Fix skin editor component list having uneven padding
2023-02-03 21:28:59 +01:00
Bartłomiej Dach
4bd43171e8
Merge branch 'master' into fix-skin-editor-padding-weirdness 2023-02-03 20:28:47 +01:00
Bartłomiej Dach
2b2d5d460b
Merge pull request #22491 from EVAST9919/triangles-old-texel
Specify `texelSize` value in the `Triangles` background
2023-02-03 20:25:40 +01:00
Bartłomiej Dach
b2a5cf9f2d
Merge branch 'master' into triangles-old-texel 2023-02-03 19:43:34 +01:00
Bartłomiej Dach
12268870d8
Merge pull request #22495 from peppy/skin-editor-dont-show-save-on-no-change
Avoid showing skin save message when changing scenes after making no changes
2023-02-03 19:41:30 +01:00
Bartłomiej Dach
59656a7286
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-03 19:08:33 +01:00
Bartłomiej Dach
651d7264fc
Merge pull request #22489 from ItsShamed/locale/skin-editor-components
Add localisation support for Skin Editor components
2023-02-03 18:00:18 +01:00
Dean Herbert
b19047b90b Fix skin editor component list having uneven padding 2023-02-03 16:55:51 +09:00
Dean Herbert
60ccf35125 Update resources 2023-02-03 16:44:53 +09:00
Dean Herbert
7b9239088b Comment space addition 2023-02-03 16:40:16 +09:00
Andrei Zavatski
14524237ac Add comment explaining texelSize value 2023-02-03 10:32:41 +03:00
Dean Herbert
92306b9123 Combine localisations for abstract skinnable components into a single file
Generally we don't want localisation files with only one to two
translations. It makes it harder for translators to handle in crowdin (a
lot of file changes for small results).

So for cases like this I believe we should be grouping translations
where it makes sense.

I've left individual components in their own files as I can see
potential for more settings to be added in the future. Plus it gives a
bit of extra context.
2023-02-03 16:02:18 +09:00
Dean Herbert
cf8cfe0d2c Move skin component localisations to namespaces 2023-02-03 15:34:57 +09:00
Dean Herbert
50559643bb Fix incorrectly applied enum localisation 2023-02-03 15:27:11 +09:00
Dean Herbert
32207dc9dd Merge branch 'master' into locale/skin-editor-components 2023-02-03 15:24:00 +09:00
Dean Herbert
5ca5f04794 Add parameter hint for optional bool value 2023-02-03 15:18:40 +09:00
Dean Herbert
9c954a93e3 Update Save method xmldoc to make more sense 2023-02-03 15:18:01 +09:00
Dean Herbert
f7094567d7 Rename and document method to limit scope 2023-02-03 15:04:47 +09:00
Bartłomiej Dach
2ba90b5447
Merge pull request #22361 from Susko3/delete-on-import-android
Delete files when importing on Android
2023-02-02 22:22:02 +01:00
Bartłomiej Dach
1af898160c
Merge branch 'master' into delete-on-import-android 2023-02-02 21:40:52 +01:00
Bartłomiej Dach
baf4a3f04e
Merge pull request #22000 from Joehuu/middle-click-replay-pause
Make replays pause with middle mouse button instead of exiting
2023-02-02 21:40:24 +01:00
Bartłomiej Dach
e937022b09
Merge branch 'master' into middle-click-replay-pause 2023-02-02 20:52:03 +01:00
Bartłomiej Dach
4d46a8f32d
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-02 19:36:23 +01:00
Bartłomiej Dach
56556e0eca
Merge pull request #22494 from peppy/skin-editor-ux-impovements
Improve transition and "non-skinnable screen" display in skin editor
2023-02-02 19:36:01 +01:00
Bartłomiej Dach
f7fa9e3927
Remove outdated comment 2023-02-02 18:41:35 +01:00
Bartłomiej Dach
779c58f9c1
Merge branch 'master' into skin-editor-ux-impovements 2023-02-02 18:16:18 +01:00
Bartłomiej Dach
6c0aada86a
Merge pull request #22490 from peppy/skin-overlay-namespace
Move skin editor to overlays namespace
2023-02-02 18:14:16 +01:00
Dean Herbert
015f4f2b38 Avoid showing skin save message when changing scenes after making no changes 2023-02-02 18:42:37 +09:00
Dean Herbert
9b6d95b3d6 Adjust skin editor pop in/out to be more snappy 2023-02-02 18:33:45 +09:00
Dean Herbert
26efb8e842 Replace white box legacy placeholder with something that visually fits 2023-02-02 18:33:31 +09:00
tsrk
843d9914c4
quality: remove new line 2023-02-02 08:18:56 +00:00
Dean Herbert
659b78058f Move replay specific key bindings to their own section 2023-02-02 15:25:52 +09:00
Dean Herbert
edecd2ee25 Merge branch 'master' into middle-click-replay-pause 2023-02-02 15:25:51 +09:00
Dean Herbert
b792dc3af0
Merge pull request #22281 from cdwcgt/editor-check-previewtime
Add preview time setting check
2023-02-02 15:10:06 +09:00
Dean Herbert
48ef25cbe5
Merge pull request #22421 from EXtremeExploit/misses-animation
Add movement to legacy misses in osu ruleset
2023-02-02 15:00:57 +09:00
Dean Herbert
91fbf388da Use localisation strings from ButtonSystem for better consistency 2023-02-02 15:00:24 +09:00
Dean Herbert
500e9c7944 Refactor into a method rather than property 2023-02-02 14:53:58 +09:00
Dean Herbert
942e7729f3 Merge branch 'master' into carousel 2023-02-02 14:41:55 +09:00
Dean Herbert
8a39afd293
Merge pull request #22402 from itsMapleLeaf/argon-mania-hold-tail-no-sprite
Improve argon osu!mania hold notes visuals and fix reverse scroll direction looking wrong
2023-02-02 14:39:23 +09:00
Dean Herbert
5b3d7a8f26 Fix typo in missing-preview-point message 2023-02-02 14:34:59 +09:00
Andrei Zavatski
175b9fc5c9 Specify texelSize value in the Triangles background 2023-02-02 08:34:38 +03:00
Dean Herbert
c2cde8361a Fix message not reading well 2023-02-02 14:33:41 +09:00
Dean Herbert
3a861fd943 Remove multiple cases of excess braces 2023-02-02 14:28:21 +09:00
Dean Herbert
50659f3d52
Merge pull request #22428 from EVAST9919/triangles-new-masking
Implement Masking property for `TrianglesV2` background
2023-02-02 14:22:16 +09:00
Dean Herbert
229fb518dc Apply NRT to LegacyJudgementPieceOld 2023-02-02 14:19:00 +09:00
Dean Herbert
183d1c5bd6 Change version comparison to match other existing code as proposed in review 2023-02-02 14:18:49 +09:00
Dean Herbert
263a7e2766 Merge branch 'master' into misses-animation 2023-02-02 14:08:15 +09:00
Dean Herbert
8dc2e6872e Move skin editor to overlays namespace 2023-02-02 14:00:31 +09:00
Dean Herbert
10df64467a
Merge pull request #22430 from peppy/skin-editor-nrt
Apply NRT to all skin editor classes
2023-02-02 13:57:57 +09:00