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

Allow Vanilla and Northstar compatibility #800

Draft
wants to merge 39 commits into
base: main
Choose a base branch
from

Conversation

VITALISED
Copy link
Contributor

@VITALISED VITALISED commented Apr 6, 2024

This PR allows the UI to work in both Vanilla R2 and Northstar, among other QOL changes

image

This is currently a draft because I haven't looked at private match ui yet, also needs -vanilla pretty sure

@VITALISED
Copy link
Contributor Author

Also please fix native playlist code

@VITALISED
Copy link
Contributor Author

Also please fix native playlist code

Nevermind

@VITALISED VITALISED marked this pull request as ready for review April 28, 2024 07:55
@VITALISED
Copy link
Contributor Author

This is in a decent state now, you'll need the launcher pr for this to work though (R2Northstar/NorthstarLauncher#694)

@r3muxd
Copy link

r3muxd commented Apr 29, 2024

why bother showing the disabled menus, just show the right menu depending on ns_is_modded_server/serverfilter

@VITALISED
Copy link
Contributor Author

They show up incredibly offset because of the combo struct index stuff

@VITALISED
Copy link
Contributor Author

why bother showing the disabled menus, just show the right menu depending on ns_is_modded_server/serverfilter

Remembered that ComboButton_SetText exists, looks a lot nicer now

@VITALISED VITALISED changed the title Allow UI to work on Vanilla and Northstar Allow Vanilla and Northstar compatibility May 1, 2024
Copy link
Member

@EladNLG EladNLG left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a full review, but eh

@@ -631,4 +631,4 @@ void function Hud_SetNavUp( var buttonFrom, var buttonTo )
void function Hud_SetNavDown( var buttonFrom, var buttonTo )
{
buttonFrom.SetNavDown( buttonTo )
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

format on save is an asshole

@@ -562,7 +548,7 @@ void function TryAuthWithLocalServer()
WaitFrame()
}

if ( NSWasAuthSuccessful() )
if ( NSWasAuthSuccessful() || GetConVarBool( "ns_auth_allow_insecure" ) )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, good change which might work better as a separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, good change which might work better as a separate PR?

This PR is never getting merged anyway dude I doubt making another one will help

Comment on lines -432 to +434
// restrict non-vanilla players from accessing official servers
bool hasNonVanillaMods = false
foreach ( string modName in NSGetModNames() )
{
if ( NSIsModEnabled( modName ) && NSIsModRequiredOnClient( modName ) )
{
hasNonVanillaMods = true
break
}
}

if ( hasNonVanillaMods )
file.mpButtonActivateFunc = null
else
file.mpButtonActivateFunc = LaunchMP
file.mpButtonActivateFunc = LaunchMP
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add an alternative to this. We don't want end-users launching multiplayer and having issues, then coming to us about them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not entirely sure how I should go about it since RequiredOnClient isn't terribly helpful since you can wrap the remotes to avoid out of sync issues. If there was some addition to the mod schema that might help but of course then old mods will have problems anyway

Comment on lines 450 to +451
// dont try and update the launch multiplayer button, because it doesn't exist
//ComboButton_SetText( file.mpButton, buttonText )
ComboButton_SetText( file.mpButton, buttonText )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// dont try and update the launch multiplayer button, because it doesn't exist
//ComboButton_SetText( file.mpButton, buttonText )
ComboButton_SetText( file.mpButton, buttonText )
ComboButton_SetText( file.mpButton, buttonText )

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these files moved and why does GitHub not show them as a move but as an add and remove?

@GeckoEidechse
Copy link
Member

What is ULTRAMenu? 👀
145e3ab

image

@VITALISED
Copy link
Contributor Author

What is ULTRAMenu? 👀 145e3ab

image

I despise vscode git

@ASpoonPlaysGames ASpoonPlaysGames marked this pull request as draft August 29, 2024 22:35
@github-actions github-actions bot added the merge conflicts Blocked by merge conflicts, waiting on the author to resolve label Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge conflicts Blocked by merge conflicts, waiting on the author to resolve
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

4 participants