-
Notifications
You must be signed in to change notification settings - Fork 117
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
base: main
Are you sure you want to change the base?
Conversation
Also please fix native playlist code |
Nevermind |
This is in a decent state now, you'll need the launcher pr for this to work though (R2Northstar/NorthstarLauncher#694) |
why bother showing the disabled menus, just show the right menu depending on ns_is_modded_server/serverfilter |
They show up incredibly offset because of the combo struct index stuff |
Remembered that ComboButton_SetText exists, looks a lot nicer now |
There was a problem hiding this 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 ) | |||
} | |||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
... why?
There was a problem hiding this comment.
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" ) ) |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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
// 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 |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
// dont try and update the launch multiplayer button, because it doesn't exist | ||
//ComboButton_SetText( file.mpButton, buttonText ) | ||
ComboButton_SetText( file.mpButton, buttonText ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
// 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 ) |
There was a problem hiding this comment.
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?
What is |
I despise vscode git |
This PR allows the UI to work in both Vanilla R2 and Northstar, among other QOL changes
This is currently a draft because I haven't looked at private match ui yet, also needs -vanilla pretty sure