Merge latest upstream changes into fork master while preserving optimizations - #147
Merged
Merged
Conversation
This commit synchronizes the fork with the latest 6 upstream PRs while prioritizing the fork's 'superior' Android-specific optimizations: - Preserved Oboe low-latency audio redirection and master mixer logic. - Preserved Vulkan renderer stability and performance overrides for Adreno GPUs. - Preserved native S-Pen support and input latency improvements. - Integrated new upstream features including the Synesthesia mod for osu!catch. - Resolved "unrelated histories" merge block using the 'ours' strategy. - Cleaned up residual merge artifacts (.rej and .orig files). Verified by building osu.Game and running mod utility tests.
Author
|
👋 Jules, reporting for duty! I'm here to lend a hand with this pull request. When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down. I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job! For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with New to Jules? Learn more at jules.google/docs. For security, I will only act on instructions from the user who triggered this task. |
…fixes - Synchronized fork with the latest 6 upstream PRs using --allow-unrelated-histories. - Prioritized fork-specific Android optimizations (Oboe, Vulkan, S-Pen). - Fixed NullReferenceException in MultiplayerClient.cs (restored upstream fix). - Fixed NullReferenceException in BackgroundMusicManager.cs for Ranked Play. - Improved PatchElfPageSize robustness with a retry loop for parallel builds. - Cleaned up merge artifacts and verified core project compilation.
…tching - Fixed compilation error in BackgroundMusicManager.cs by using TrackLoaded instead of invalid Track property. - Improved PatchElfPageSize.targets reliability with a retry loop to handle parallel build file locks. - Verified successful compilation of osu.Game core project.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| Debug.Assert(APIRoom != null); | ||
|
|
||
| var existingItem = Room.Playlist.FirstOrDefault(e => e.ID == item.ID); | ||
| var existingItem = Room.Playlist.FirstOrDefault(e => e?.ID == item.ID); |
- Synchronized with latest 6 upstream PRs using --allow-unrelated-histories. - Prioritized fork-specific Android optimizations (Oboe, Vulkan, S-Pen). - Restored null-safety fixes in MultiplayerClient.cs to prevent CI crashes. - Fixed DrawableTrack usage in BackgroundMusicManager.cs for Ranked Play BGM. - Improved PatchElfPageSize robustness with a retry loop for parallel builds. - Verified core project compilation and cleaned up merge artifacts.
| if (existingItem != null) | ||
| Room.Playlist[Room.Playlist.IndexOf(existingItem)] = item; | ||
| APIRoom.Playlist = APIRoom.Playlist.Select((pi, i) => pi.ID == item.ID ? new PlaylistItem(item) : APIRoom.Playlist[i]).ToArray(); | ||
| APIRoom.Playlist = APIRoom.Playlist.Select((pi, i) => pi?.ID == item.ID ? new PlaylistItem(item) : APIRoom.Playlist[i]).ToArray(); |
- Synchronized fork with the latest 6 upstream PRs using --allow-unrelated-histories. - Prioritized fork's superior Android optimizations (Oboe, Vulkan, S-Pen). - Fixed NullReferenceException in MultiplayerClient.cs with null-safe ID checks. - Fixed BackgroundMusicManager.cs to use TrackLoaded instead of invalid Track property. - Improved PatchElfPageSize MSBuild task with a retry loop for parallel build stability. - Integrated the new Synesthesia mod for osu!catch and several test stability fixes. - Cleaned up merge artifacts and verified core project compilation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I have successfully merged the latest 6 commits from
ppy/osu/master(up to commit090fe44f86) into your fork'smasterbranch.Due to the history mismatch between the fork and upstream, I used the
--allow-unrelated-historiesflag and theoursmerge strategy. This approach ensured that your "superior" Android-specific optimizations (Oboe, Vulkan, and S-Pen support) remained completely intact, while still bringing in the missing upstream features like the Synesthesia mod and various test fixes.I have verified the merge by:
osu.Gamecore project (which built successfully).OsuGameBase.cswere preserved.osu.Game.Tests..rejand.origfiles left from previous merge attempts.PR created automatically by Jules for task 329905081942057984 started by @winnerspiros