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

67217 Commits

Author SHA1 Message Date
Dean Herbert
69d699a218
Merge branch 'master' into footer-v2-button-animation 2024-05-11 21:41:50 +08:00
Dean Herbert
6cfe1356cd
Merge pull request #28141 from frenzibyte/footer-v2-mods-display
Add mod display and unranked indicator to new song select footer
2024-05-11 21:41:25 +08:00
Dean Herbert
a988bbd3cb
Tidy up UnrankedBadge implementation 2024-05-11 20:58:51 +08:00
Dean Herbert
ac7598cb68
Move localisation to existing file to avoid silly new class 2024-05-11 20:25:47 +08:00
Salman Ahmed
da096376af Fix DI error in mod tooltip 2024-05-11 09:31:36 +03:00
Salman Ahmed
f64cf5c037 Fix button extending beyond unranked indicator width 2024-05-11 09:29:09 +03:00
Dean Herbert
ea35ad4689
Fix nullability inspection 2024-05-10 23:26:43 +08:00
Dean Herbert
a780abb0b4
Merge pull request #27912 from bdach/pre-mod-multiplier-score
Store total score without mod multipliers to local database and to replays, and send it on score submission
2024-05-10 22:46:34 +08:00
Dean Herbert
e887f93eca
Always show placeholder on unknown / missing country 2024-05-10 22:45:59 +08:00
Dean Herbert
b026309e36
Add setting to allow hiding all country flags
There have been enough requests for this at this point to implement it.
2024-05-10 20:32:21 +08:00
Bartłomiej Dach
5285b35d64
Merge pull request #28143 from peppy/update-logo-v4b
Update logo to v4b
2024-05-10 12:58:19 +02:00
Dean Herbert
4add1bf816
Update metadata assets 2024-05-10 18:38:11 +08:00
Dean Herbert
ca608a8443
Update resources 2024-05-10 18:36:44 +08:00
Bartłomiej Dach
665ab3dfd0
Update android icon assets 2024-05-10 10:04:55 +02:00
Dean Herbert
c25ed2cddd
Update desktop logo 2024-05-10 14:12:32 +08:00
Dean Herbert
bc6f3b8cb4
Update iOS logo 2024-05-10 13:48:08 +08:00
Salman Ahmed
09c52f03d8 Fix "options" button behaving weirdly when clicking on it while open 2024-05-10 08:25:16 +03:00
Salman Ahmed
b6d6a8940b Improve animation of new song select footer buttons 2024-05-10 08:24:39 +03:00
Salman Ahmed
0392f7b04c Add tooltip to unranked indicator 2024-05-10 07:37:08 +03:00
Salman Ahmed
f5ab9a7ff8 Make unranked indicator orange to match mod select overlay 2024-05-10 07:12:28 +03:00
Salman Ahmed
e5b2023155 Remove unappealing fade transition between mod display and count text
Fading out the mod display looks quite ugly, since alpha is applied per mod sprite, introducing bad visual on the intersection between mods.
2024-05-10 07:05:36 +03:00
Salman Ahmed
6ddf8f8498 Few cleanups 2024-05-10 06:55:02 +03:00
Salman Ahmed
c1ea9d2c9f Adjust unranked badge height 2024-05-10 06:48:18 +03:00
Salman Ahmed
bff34a1c04 Add localisation and tooltip for mods count text 2024-05-10 06:48:18 +03:00
Salman Ahmed
49692e168e Fix ModDisplay expanding on load with "always contracted/expanded" modes
This is especially visible when reloading `SongSelectFooterV2` while multiple mods are already selected. The mods will appear expanded then contract.
2024-05-10 06:48:18 +03:00
Salman Ahmed
d7b658ec76 Add similar test steps to song select footer test scene 2024-05-10 02:21:06 +03:00
Salman Ahmed
6b91b4abf4 Add simple implementation for extended mods display in new footer design 2024-05-10 02:20:48 +03:00
Dean Herbert
f9a172faec
Merge pull request #28028 from bdach/framework-bump
Apply adjustments after framework changes
2024-05-09 22:38:44 +08:00
Dean Herbert
de05998421
Avoid weird codestyle rules 2024-05-09 22:17:00 +08:00
Dean Herbert
c4d6318c0d
Update framework 2024-05-09 22:12:09 +08:00
Dan Balasescu
13692d8e7a
Merge branch 'masking-changes' into framework-bump 2024-05-09 21:11:54 +09:00
Dan Balasescu
3b8b56cbcb
Apply required changes after framework masking updates 2024-05-09 20:18:53 +09:00
Dean Herbert
7dc238d32c
Merge pull request #28122 from Ekischleki/Make-deletion-confirmation-less-confusing
Make deletion confirmation less confusing
2024-05-09 14:40:30 +08:00
Dean Herbert
58636d4bfb
Merge branch 'master' into Make-deletion-confirmation-less-confusing 2024-05-09 14:40:11 +08:00
Dean Herbert
88b20b357a
Increase padding around text in dialogs 2024-05-09 14:38:10 +08:00
Bartłomiej Dach
c9414da5d4
Merge branch 'master' into pre-mod-multiplier-score 2024-05-08 13:39:44 +02:00
Dan Balasescu
08cd8a3122
Merge pull request #28119 from bdach/user-id-in-replays
Persist user ID to replay data
2024-05-08 18:29:40 +09:00
Bartłomiej Dach
5a9a786199
Merge branch 'master' into user-id-in-replays 2024-05-08 10:43:25 +02:00
Bartłomiej Dach
7551cf01d1
Fix test failure 2024-05-08 09:45:52 +02:00
Ekischleki
e4bfa6f46b
Merge branch 'master' into Make-deletion-confirmation-less-confusing 2024-05-07 18:45:02 +02:00
Erik Wolfschläger
ab2677d913 Changed default delete confirmation content strings for better translatability 2024-05-07 17:15:49 +02:00
Dean Herbert
069841b2b3
Merge pull request #28128 from peppy/update-bundled-beatmaps
Update bundled beatmaps
2024-05-07 22:48:48 +08:00
Dan Balasescu
1f1fc87fb6
Merge pull request #28127 from peppy/random-menu-image
Randomise which menu content is shown on arriving at the menu
2024-05-07 18:32:27 +09:00
Dean Herbert
0ddd3cbdc5
Randomise which menu content is shown on arriving at the menu 2024-05-07 17:02:25 +08:00
Dean Herbert
1d6915478f
Add message letting users know that beatmaps are donwloading in the background 2024-05-07 14:26:49 +08:00
Dean Herbert
91c684151a
Update bundled beatmaps 2024-05-07 14:18:50 +08:00
Dean Herbert
0ac0d6a11a
Merge pull request #28124 from Susko3/fix-userTriggered-toast
Fix `userTriggered` param not being passed to private helper
2024-05-07 11:17:07 +08:00
Susko3
f824bd1441 Fix userTriggered not being passed to private helper 2024-05-06 21:52:03 +02:00
Erik Wolfschläger
12522d9ae5 Fix formatting issues 2024-05-06 18:29:46 +02:00
Erik Wolfschläger
32444e0e30 Make deletion confirmation content less confusing 2024-05-06 18:11:40 +02:00