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

42730 Commits

Author SHA1 Message Date
Dean Herbert
d7d569cf4e
Temporary rollback of framework / SDL3 2024-05-21 14:36:16 +08:00
Dean Herbert
e740b8bcc3
Fix single frame glitching in skin editor
https://github.com/ppy/osu/pull/28257#discussion_r1606999574
2024-05-21 14:36:11 +08:00
Dean Herbert
3b86da443b
Merge pull request from bdach/fix-skin-editor-spaz
Fix closest anchor selection spazzing out in multiple scenarios
2024-05-21 14:35:29 +08:00
Aurelian
db8b72eb37 Clamped Difficulty Ranges to [0,10] 2024-05-20 16:23:16 +02:00
Bartłomiej Dach
ed498f6eed
Do not attempt to match score by equality of hash if it's empty
Closes https://github.com/ppy/osu/issues/28216.

The affected user's database contained six sentakki scores with an empty
hash. When an online score is being imported, an online model (which
does not have a hash) will be transmogrified into a `ScoreInfo` with
an empty hash, which would end up accidentally matching those scores
and basically breaking everything at that point.

To fix, avoid attempting to match anything on empty hash. This does not
break online score matching because for those cases the actual online ID
of the score will be used.
2024-05-20 15:05:41 +02:00
Bartłomiej Dach
3da3b91be5
Improve closest origin selection to include effects of rotation/flip
Closes https://github.com/ppy/osu/issues/28237.

Solution as proposed here:
https://github.com/ppy/osu/pull/28089#issuecomment-2095372157

For flips and rotations by 90 degrees this does what you would expect it
to. For arbitrary rotations it *sort of kind of* attempts to do this but
the results are a bit wonky - probably still better than what was there
before, though?
2024-05-20 10:23:12 +02:00
Bartłomiej Dach
c03f68413a
Fix skin editor closest origin selection spazzing out on scaled sprites
Closes https://github.com/ppy/osu/issues/28215.

`drawable.Position` is a location in the parent's coordinate space, and
`drawable.OriginPosition` is in the drawable's local space and
additionally does not take scale into account.
2024-05-20 10:23:07 +02:00
Susko3
04acc58b74 Don't show warning on android
Unsure about iOS.
2024-05-19 14:12:21 +02:00
Susko3
e4858a975d Show mouse and joystick settings on mobile 2024-05-19 14:07:40 +02:00
Bartłomiej Dach
be642c8c42
Fix total score without mods migration failing on custom ruleset scores when custom ruleset cannot be loaded
Closes https://github.com/ppy/osu/issues/28209.

Yes this means that such scores will have a zero total score without
mods in DB and thus might up getting their total recalculated to zero
when we try a mod multiplier rebalance (unless we skip scores with zero
completely I suppose). I also don't really care about that right now.
2024-05-19 09:43:33 +02:00
Dean Herbert
9fcd3b562a
Merge pull request from frenzibyte/fix-settings-padding
Fix checkboxes looking misaligned when placed next to a slider bar
2024-05-19 10:36:54 +08:00
Fabian van Oeffelt
3fdbd735ce change to single Function,
Nightcore now switches into Daycore, keep Adjustpitch after change
2024-05-18 18:40:51 +02:00
Fabian van Oeffelt
80064c4b98 Speedchange now also works in Modselect 2024-05-18 18:38:23 +02:00
Fabian van Oeffelt
a12a20e8b5 Change Inputkeys to Ctrl+Up/Ctrl+Down 2024-05-18 18:37:44 +02:00
Dean Herbert
37fdfbfaa0
Merge branch 'master' into footer-v2-back-button 2024-05-18 22:15:32 +08:00
Dean Herbert
7b847ad815
Merge pull request from frenzibyte/footer-v2-renamings
Rename and move new footer classes to appropriate places
2024-05-18 22:14:45 +08:00
Salman Ahmed
a912e56ca9 Fix checkboxes applying extra padding 2024-05-18 11:06:29 +03:00
Aurelian
0af32c5d4b Added a minimum value for the scale calculated by the CS value. 2024-05-18 07:45:01 +02:00
Bartłomiej Dach
a4142937e7
Update resources 2024-05-17 12:53:25 +02:00
Bartłomiej Dach
c9b7aaf442
Fix formatting 2024-05-17 11:50:23 +02:00
Bartłomiej Dach
a4f8ed2a0e
Add button to access daily challenge playlist from main menu 2024-05-17 11:15:52 +02:00
Bartłomiej Dach
61a415fed2
Add client/server models & operations for "daily challenge" feature 2024-05-17 10:58:08 +02:00
Bartłomiej Dach
e604a99053
Merge branch 'master' into fix-mismatching-localisation-xmldoc 2024-05-17 08:47:14 +02:00
Dan Balasescu
2f9d74286d
Bump once more 2024-05-17 11:15:17 +09:00
Bartłomiej Dach
f2f03f08cb
Fix xmldoc mismatches in localisation files
This is enforced by the localisation analyser after
https://github.com/ppy/osu-localisation-analyser/pull/62, but it appears
the analyser was never actually bumped game-side after that change and
I'm not super sure why, as there does not appear to be a reason to _not_
do that. So this commit does it.
2024-05-16 17:39:27 +02:00
Bartłomiej Dach
5dd64a7c86
Fix duplicated localisation key in DeleteConfiormationContentStrings
Noticed via `osu-resources` build warnings.

There are also a few other warnings about
https://github.com/ppy/osu/pull/27472. Seems something in crowdin
innards may still be exporting those strings even though they have been
fixed already. Not sure how to address that.

Probably need these to be detected via static analysis at this point
since it's happened again. Might look into the feasibility of making
that happen.
2024-05-16 14:49:56 +02:00
Salman Ahmed
820cfbcb00 Remove unused using directives 2024-05-16 07:47:57 +03:00
Salman Ahmed
310b4d90cc Move SHEAR constant to OsuGame and revert back to 0.2x (i.e. master)
Discussed in [discord](https://discord.com/channels/188630481301012481/188630652340404224/1240490608934653984).
2024-05-16 07:28:02 +03:00
Salman Ahmed
9265290acf Change shear factor everywhere to 0.15x 2024-05-16 05:33:01 +03:00
Salman Ahmed
7fce4cc494 Make ScreenFooterButtonMods share shear factor with base class 2024-05-16 05:30:28 +03:00
Salman Ahmed
9446f45acf Fix shear factor of ScreenFooterButtons not matching anything else
When shear factors differ between components that are close to each other (`BackButtonV2` and `ScreenFooterButton` in this case), they look completely ugly.
2024-05-16 05:30:28 +03:00
Salman Ahmed
7e8d5a5b0a Add new footer back button 2024-05-16 05:30:28 +03:00
Salman Ahmed
266f080362 Allow customising content of ShearedButtons 2024-05-16 05:02:56 +03:00
Salman Ahmed
e3afd89dc8 Allow specifying height of ShearedButtons
Also includes a test case in `TestSceneShearedButton`s to ensure the buttons' shear factors don't change on different heights (I've encountered issues with that previously).
2024-05-16 05:02:56 +03:00
Salman Ahmed
21f5d891bb Rename and move footer classes to appropriate places 2024-05-16 04:41:16 +03:00
OliBomby
c4ac6d20a0 fix code quality 2024-05-15 23:40:51 +02:00
OliBomby
8df5f22b4e Merge remote-tracking branch 'upstream/master' into scaling 2024-05-15 23:05:19 +02:00
Dean Herbert
a3960bf715
Add inline comment explaining LifetimeEnd set for future visitors 2024-05-15 14:17:28 +08:00
Bartłomiej Dach
7c1640e124
Merge pull request from peppy/fix-catch-dho-performance
Set a rudimentary lifetime end to improve seek performance in scrolling rulesets
2024-05-14 19:27:40 +02:00
Dean Herbert
cff865b556
Continue loading even when osu! logo is being dragged at loading screen
Closes https://github.com/ppy/osu/issues/28130.
2024-05-14 23:54:07 +08:00
Dean Herbert
c31b503f2a
Merge pull request from bdach/present-score-different-hashes
Use hash rather than online ID as primary lookup key when presenting score
2024-05-14 23:39:54 +08:00
Bartłomiej Dach
ee9144c3bd
Apply NRT to results statistics displays 2024-05-14 15:21:12 +02:00
Bartłomiej Dach
414f023817
Apply NRT to RankText 2024-05-14 15:21:05 +02:00
Bartłomiej Dach
b937b94bd2
Apply NRT to RankBadge 2024-05-14 15:20:56 +02:00
Bartłomiej Dach
ced1c79490
Apply NRT to AccuracyCircle 2024-05-14 15:20:47 +02:00
Bartłomiej Dach
e7721b073c
Apply NRT to ContractedPanelTopContent 2024-05-14 15:20:36 +02:00
Bartłomiej Dach
8e16b57d09
Apply NRT to SimpleStatisticTable 2024-05-14 15:20:26 +02:00
Bartłomiej Dach
237ae8b46a
Apply NRT to SimpleStatisticsItem 2024-05-14 15:20:17 +02:00
Bartłomiej Dach
2f2257f6ce
Apply NRT to PerformanceBreakdownChart 2024-05-14 15:20:07 +02:00
Bartłomiej Dach
77a7f475ee
Apply NRT to ScorePanel 2024-05-14 15:19:58 +02:00
Bartłomiej Dach
10a8e84046
Apply NRT to StatisticsPanel 2024-05-14 15:19:46 +02:00
Bartłomiej Dach
cb49147d1e
Apply NRT to ScorePanelList 2024-05-14 15:19:43 +02:00
Bartłomiej Dach
03a279a48d
Use hash rather than online ID as primary lookup key when presenting score
Something I ran into when investigating
https://github.com/ppy/osu/issues/28169.

If there are two scores with the same online ID available in the
database - for instance, one being recorded locally, and one recorded by
spectator server, of one single play - the lookup code would use online
ID first to find the score and pick any first one that matched. This
could lead to the wrong replay being refetched and presented / exported.

(In the case of the aforementioned issue, I was confused as to whether
after restarting spectator server midway through a play and importing
the replay saved by spectator server after the restart, I was seeing a
complete replay with no dropped frames, even though there was nothing in
the code that prevented the frame drop. It turns out that I was getting
presented the locally recorded replay instead all along.)

Instead, jiggle the fallback preference to use hash first.
2024-05-14 11:16:50 +02:00
Dean Herbert
cfb2c8272b
Set a rudimentary lifetime end to improve seek performance in scrolling rulesets 2024-05-14 05:02:08 +08:00
Bartłomiej Dach
87f2a23263
Merge pull request from peppy/hide-country-flags
Add setting to allow hiding all country flags
2024-05-13 10:10:38 +02:00
Dean Herbert
5a362be190
Merge branch 'master' into glow 2024-05-12 12:58:57 +08:00
Dean Herbert
147ebb6bc7
Merge pull request from frenzibyte/footer-v2-button-animation
Improve animation of new song select footer buttons
2024-05-12 11:07:30 +08:00
Salman Ahmed
fa6ccc854d Revert behavioural changes on options button 2024-05-12 05:24:45 +03:00
Thomas Mok
5e8f6df799
Add glow to footerV2 buttons 2024-05-12 01:55:18 +01:00
Salman Ahmed
4cf6ab40f6 Use MustDisposeResource annotation to appease ReSharper inspections 2024-05-11 22:33:18 +03:00
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 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 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
Dean Herbert
ca608a8443
Update resources 2024-05-10 18:36:44 +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
6b91b4abf4 Add simple implementation for extended mods display in new footer design 2024-05-10 02:20:48 +03: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
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
Bartłomiej Dach
5a9a786199
Merge branch 'master' into user-id-in-replays 2024-05-08 10:43:25 +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 from peppy/update-bundled-beatmaps
Update bundled beatmaps
2024-05-07 22:48:48 +08: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
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 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
Dean Herbert
29eef26a69
Merge pull request 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
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 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
71776a583c
Merge branch 'master' into preset-td-autoplay 2024-05-06 09:02:08 +02:00
Bartłomiej Dach
4c7e6b125c
Add clarification comment 2024-05-06 08:49:30 +02:00
Bartłomiej Dach
cf22fc143f
Merge pull request from frenzibyte/storyboard-loops-v2
Refactor storyboard commands structure and add framework-based transform loop support
2024-05-06 08:39:07 +02:00
Dean Herbert
12cd3bbe1c
Fix incorrect scale handling due to selection point changes 2024-05-06 11:34:37 +08:00
Dean Herbert
6f0fc6f78f
Merge pull request from Joehuu/fix-broken-scrolling-unicode
Fix now playing overlay text scroll breaking when toggling metadata language setting
2024-05-06 11:15:51 +08:00
Joseph Madamba
359238395f Fix now playing overlay text scroll breaking when toggling metadata language setting 2024-05-05 15:43:46 -07:00
Joseph Madamba
1665c5e0e1 Use existing AutomaticallyDownloadMissingBeatmaps localisation on solo spectator screen 2024-05-05 14:41:48 -07:00
Dean Herbert
9e7712740b
Refactor for legibility 2024-05-05 23:33:37 +08:00
Jonas Brandstötter
b1696db9c8
Reorder imports with dotnet format 2024-05-04 16:32:18 +02:00
Jonas Brandstötter
c62952ea3a
Invoke the registered Action when a stateful item is right clicked 2024-05-04 16:27:06 +02:00
Jonas Brandstötter
21917218ce
No longer keep menu open when CTRL is held 2024-05-04 16:27:06 +02:00
cdwcgt
1f92f1d19b
remove blank line
nt
2024-05-04 20:41:36 +08:00
cdwcgt
fe30ca3d39
fix linq logic 2024-05-04 20:18:31 +08:00
cdwcgt
f9be9ed479
remove incompatible system mods before enable preset 2024-05-04 19:58:32 +08:00
Dean Herbert
002efca422
Merge pull request from bdach/do-not-lookup-usernames-for-offline-scores
Do not lookup usernames for scores without an online ID
2024-05-04 15:08:33 +08:00
Dean Herbert
2cb367fdce
Disable "origin" menu when in "Closest" placement mode 2024-05-04 13:29:05 +08:00
Dean Herbert
e7ca02ffde
Fix position changing when origin updates during a drag 2024-05-04 13:28:33 +08:00
Dean Herbert
0b61e2cd42
Use closest origin along with closest anchor 2024-05-04 13:09:51 +08:00
Jonas Brandstötter
e0e7e123bf
Keep menus open when clicking a stateful item with CTRL held 2024-05-03 17:26:10 +02:00
Dean Herbert
5cdaafdb1e
Merge pull request from bdach/beatmap-attribute-text-breakage
Fix `BeatmapAttributeText` breaking due to enum serialisation woes
2024-05-03 21:18:26 +08:00
Dean Herbert
6cec4f0c8f
Merge pull request from bdach/refresh-local-cache-more-often
Update local metadata lookup cache more often
2024-05-03 20:44:13 +08:00
Bartłomiej Dach
a23d25e0a1
Fix BeatmapAttributeText breaking due to enum serialisation woes 2024-05-03 14:27:34 +02:00
Dean Herbert
ecb9173e51
Merge pull request from Joehuu/scrollable-text
Scroll now playing overlay text when overflowing
2024-05-03 20:05:58 +08:00
Bartłomiej Dach
afb491dff0
Do not perform username lookups for scores without an online ID 2024-05-03 13:59:36 +02:00
Bartłomiej Dach
7d31af6f16
Fix room status not updating when password is changed while inside the room 2024-05-03 11:37:09 +02:00
Bartłomiej Dach
221b4cd599
Remove unused cache 2024-05-03 11:37:09 +02:00
Dean Herbert
7141177966
Better signify private rooms by showing a different status pill design 2024-05-03 17:17:35 +08:00
Dean Herbert
42e49067e5
Move Room.Status updates to a common location 2024-05-03 17:10:59 +08:00
Bartłomiej Dach
3840e92576
Merge pull request from peppy/fix-chat-ui-scale
Fix chat overlay being far too large
2024-05-03 09:04:07 +02:00
Bartłomiej Dach
cf27366f99
Merge branch 'master' into fix-double-load-playlist-backgrounds 2024-05-03 08:15:56 +02:00
Bartłomiej Dach
d1a50ff85b
Remove redundant conditional access 2024-05-03 08:11:00 +02:00
Bartłomiej Dach
53b9159a01
Merge pull request from peppy/default-beatmap-background-be-gone
Stop using visually noisy `bg4` for default backgrounds
2024-05-03 08:06:22 +02:00
Dean Herbert
c935d3bf6c
Reduce font size in channel listing too 2024-05-03 14:00:28 +08:00
Joseph Madamba
c21b7c7df9 Use IsLoaded instead of Schedule 2024-05-02 22:46:42 -07:00
Dean Herbert
c1e9b6d4ca
Fix beatmap backgrounds loading default briefly before final display
Due to the way `ModelBackedDrawable` works, the default starts to get
loaded even though a final `Beatmap` has been set. This avoids loading
the default fallback unless a beatmap has been set (and has no
background itself).
2024-05-03 13:42:56 +08:00
Dean Herbert
058bd5ced6
Stop using visually noisy bg4 for default backgrounds
This has always really annoyed me.
2024-05-03 13:38:27 +08:00
Dean Herbert
3249ecee27
Fix chat overlay being far too large 2024-05-03 12:31:19 +08:00
Dean Herbert
aa4d16bdb8
Fix beatmap listing cards being far too large 2024-05-03 12:13:52 +08:00
Joseph Madamba
c15a685071 Remove unused usings 2024-05-02 17:07:49 -07:00
Joseph Madamba
381ddb0676 Fix weird formatting 2024-05-02 17:06:11 -07:00
Joseph Madamba
269077f854 Only support centre anchors 2024-05-02 17:06:11 -07:00
Joseph Madamba
2f075e3247 Apply half margin of tolerance on both sides before text scrolls 2024-05-02 17:06:11 -07:00