DL2x/dv-multiplayer
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge incomming #1

Open
DL2x wants to merge 10 commits from incomming into oculus-compat
pull from: incomming
merge into: DL2x:oculus-compat
Conversation 0 Commits 10 Files changed 17 +1443 -1185
DL2x commented 2026-01-09 13:11:56 +01:00
Owner
Copy link
No description provided.
DL2x added 10 commits 2026-01-09 13:11:56 +01:00 
Previously, incompatible mods were ignored by returning null. Now, they are added to the localMods list.
Updated the project file to publicise DV.UIFramework.CollapsibleElement.

Changed the Awake method from protected to public override in ServerBrowserElement and ServerBrowserPlaceholderElement due to new publicised protection levels.
Server browser now displays required and extra mods with compatibility status, including localised labels for OK, mismatch, missing, incompatible, and extra mods. UI elements for mod lists are collapsible and support hyperlinks. Locale keys and translations for new mod status labels were added. Refactored MainMenuControllerPatch to expose MainMenuControllerInstance for easier access.
Replaces modsContainer with detailsContent for mod elements, updates how mod groups are set up, and improves formatting for server details and mod labels.
Replaced hardcoded disconnect reason strings with localized values in ServerBrowserPane. Added separate localized 'yes' and 'no' responses for password required in server details. Updated Locale.cs and locale.csv to support new keys for these values.
Eliminates redundant display of the host details label in the server browser pane by appending only the server details string. This improves clarity and prevents repeated information in the server details section.
Updated references from 'gameParams' to 'GameParams' to match the correct property.
clone incomming changes
This pull request has changes conflicting with the target branch.
  • Multiplayer/Components/MainMenu/HostGamePane.cs
  • Multiplayer/Components/MainMenu/ServerBrowserPane.cs
  • Multiplayer/Locale.cs
  • locale.csv
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin incomming:incomming
git switch incomming

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch oculus-compat
git merge --no-ff incomming
git switch incomming
git rebase oculus-compat
git switch oculus-compat
git merge --ff-only incomming
git switch incomming
git rebase oculus-compat
git switch oculus-compat
git merge --no-ff incomming
git switch oculus-compat
git merge --squash incomming
git switch oculus-compat
git merge --ff-only incomming
git switch oculus-compat
git merge incomming
git push origin oculus-compat
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
DL2x/dv-multiplayer!1
No description provided.