Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 2024.519.1 #58

Open
wants to merge 429 commits into
base: master
Choose a base branch
from
Open

Merge upstream 2024.519.1 #58

wants to merge 429 commits into from

Conversation

ILW8
Copy link
Owner

@ILW8 ILW8 commented May 19, 2024

No description provided.

TTTaevas and others added 30 commits April 27, 2024 23:43
…sation

Rather than creating a "corrupt" realm file in such cases, the game will
now refuse to start. This behaviour is usually what we want. In most
cases a second click on the game will start it successfully (the
previous instance's file handles are still doing stuff, or windows
defender is being silly).

Closes ppy/osu#28018.
Constant complaints about startup volume mean we should reduce it
further and let users adjust as they see fit.
Until we have full encoding support for storyboards, this stop-gap
measure ensures that storyboards don't just disappear from existence.
After way too much time investigating this, the encoding situation is
not great right now.

- Stable sets the "default code page" to be used for encoding filenames
to Shift-JIS (932):
https://github.com/peppy/osu-stable-reference/blob/c29ebd7fc52113013fb4ac2db230699d81e1fe2c/osu!/GameBase.cs#L3099
- Lazer does nothing (therefore using UTF-8).

When importing to lazer, stable files are assumed to be UTF-8. This
means that the linked beatmaps don't work correctly. Forcing lazer to
decompress *and* compress using Shift-JIS will fix this.

Here's a rough idea of how things look for japanese character filenames
in current `master`:

| | stable | lazer |
|--------|--------|--------|
| export encoding | shift-jis | utf8 |
| utf8 [bit flag](https://superuser.com/a/1507988) set | ❌ | ❌ |
| import stable export osz | ✅  | ❌ |
| import lazer export osz | ❌ | ✅ |
| windows unzip | ❌ | ❌ |
| macos unzip | ✅ | ✅ |

and after this change

| | stable | lazer |
|--------|--------|--------|
| export encoding | shift-jis | shift-jis |
| utf8 [bit flag](https://superuser.com/a/1507988) set | ❌ | ❌ |
| import stable export osz | ✅  | ✅ |
| import lazer export osz | ✅ | ✅ |
| windows unzip | ❌ | ❌ |
| macos unzip | ✅ | ✅ |

A future endeavour to improve compatibility would be to look at setting
the utf8 flag in lazer, switching the default to utf8, and ensuring the
stable supports this flag (I don't believe it does right now).
Was added in cc76c58 without any
specific reasoning. Likely not required (and will fix some storyboard
elements inside `.osu` files from not being correctly saved).
Check realm file can be written to before attempting further initialisation
Fix filenames containing japanese not being read correctly
If the API login (and thus user set) completed between `load` and
`LoadComplete`, the re-fetch on user change would not yet be hooked up,
causing an incorrect default background to be used instead.

Of note, moving this out of async load doesn't really affect load
performance as the bulk of the load operation is already scheduled and
`LoadComponentAsync`ed anyway
Fix incorrect background being loaded due to async race
peppy and others added 29 commits May 14, 2024 23:01
Apply NRT to results-related components
Use hash rather than online ID as primary lookup key when presenting score
Continue loading even when osu! logo is being dragged at loading screen
Set a rudimentary lifetime end to improve seek performance in scrolling rulesets
Add more usable osu!mania touch input system
- Closes ppy/osu#25852
- Reverts ppy/osu#25336 /
  ppy/osu#25777

With the columns not being directly touchable anymore after
ppy/osu#28173 I see very little point to this
continuing to exist.
Noticed via `osu-resources` build warnings.

There are also a few other warnings about
ppy/osu#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.
This is enforced by the localisation analyser after
ppy/osu-localisation-analyser#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.
Fix discord arbitrarily refusing to work on "too short" strings
Fix duplicated localisation key in `DeleteConfirmationContentStrings`
…al-builds

Remove `TreatWarningsAsErrors` flags from local builds for developer convenience
Rename and move new footer classes to appropriate places
Reduce container nesting inside `PathControlPointPiece`
Fix checkboxes looking misaligned when placed next to a slider bar
…es when custom ruleset cannot be loaded

Closes ppy/osu#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.
Fix total score without mods migration failing on custom ruleset scores when custom ruleset cannot be loaded
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
@ILW8 ILW8 force-pushed the merge-upstream-2024.519.1 branch from 0589a76 to 92f1a32 Compare May 19, 2024 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.