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

66990 Commits

Author SHA1 Message Date
js1086
20c54ab697 Apply code quality changes 2024-05-23 19:08:32 +01:00
apollo-dw
9ff277cfb3
Merge pull request #9 from TextAdventurer12/no-combo-scaling
Change miss penalty (nerf longer maps)
2024-05-21 21:47:38 +01:00
danielthirtle
c1efcc054c Change miss penalty (nerf longer maps) 2024-05-21 21:03:53 +12:00
apollo-dw
9b60abe486
Merge branch 'ppy:master' into no-combo-scaling 2024-05-11 13:24:16 +01:00
apollo-dw
1d19bd2e34
Merge pull request #7 from TextAdventurer12/no-combo-scaling
Fix adding a diffspike reducing PP
2024-05-11 13:23:55 +01: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
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
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
Erik Wolfschläger
a694f46253 Add new localisable strings 2024-05-06 18:10:58 +02:00
Bartłomiej Dach
9c6968c13a
Use score.User.OnlineID instead of score.UserID
You'd hope that they'd be the same thing, but
post-https://github.com/ppy/osu-server-spectator/pull/230 it turns out
that cannot be guaranteed, so just attempt to use `User` in the encoder
consistently everywhere...
2024-05-06 16:29:03 +02:00
Bartłomiej Dach
d7a0fdce07
Merge pull request #28089 from peppy/use-closest-origin
Automatically choose origin (along with anchor) to make skin editor placement easier for users
2024-05-06 14:57:34 +02:00
Bartłomiej Dach
abfb2c00bc
Look up users by ID if available when importing scores 2024-05-06 13:24:34 +02:00
Bartłomiej Dach
bd869b6cdc
Add failing tests for looking up users by online ID if present when importing scores 2024-05-06 13:24:24 +02:00
Dean Herbert
29eef26a69
Merge pull request #28118 from bdach/scaling-mode-does-not-affect-skin-editor
Fix sizing of gameplay preview in skin editor not updating on scaling mode change
2024-05-06 18:46:48 +08:00
Bartłomiej Dach
554ead0d9d
Decode user ID from score if available 2024-05-06 12:28:13 +02:00
Bartłomiej Dach
4d9ccdc3b2
Encode user ID to replays 2024-05-06 12:28:13 +02:00
Bartłomiej Dach
353a07f7a5
Fix code quality inspection 2024-05-06 12:23:11 +02:00
Dan Balasescu
4c2ac479b7
Merge pull request #28116 from bdach/integration-settings-only-on-desktop
Do not show integration settings on mobile
2024-05-06 19:20:32 +09:00
Bartłomiej Dach
f066026503
Fix sizing of gameplay preview in skin editor not updating on scaling mode change
Closes https://github.com/ppy/osu/issues/28115.
2024-05-06 11:55:51 +02:00
Bartłomiej Dach
cf87e9cd40
Do not show integration settings on mobile
Closes https://github.com/ppy/osu/issues/28097.

The settings weren't actually doing anything at all there anyway.
2024-05-06 11:24:42 +02:00
Bartłomiej Dach
761d713593
Merge pull request #28086 from 424ever/ctrl-keeps-menu-open
Activate stateful menu items with right-click without closing the menu
2024-05-06 09:30:22 +02:00
Bartłomiej Dach
3e36412899
Merge pull request #28095 from cdwcgt/preset-td-autoplay
Do not attempt to preserve incompatible system mods when activating mod presets
2024-05-06 09:29:08 +02:00
Bartłomiej Dach
71776a583c
Merge branch 'master' into preset-td-autoplay 2024-05-06 09:02:08 +02:00