Merge branch 'main' into remove-auth-port-cfg

R2Northstar · Jul 9, 2023 · 766d151 · 766d151
2 parents a4d75fd + 6727571
commit 766d151
Show file tree

Hide file tree

Showing 31 changed files with 5,392 additions and 602 deletions.
diff --git a/.github/nativefuncs.json b/.github/nativefuncs.json
@@ -449,76 +449,10 @@
 			"argTypes":""
 		},
 		{
-			"name":"NSGetServerName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerDescription",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerMap",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerPlaylist",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerPlayerCount",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerMaxPlayerCount",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerID",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSServerRequiresPassword",
-			"helpText":"",
-			"returnTypeString":"bool",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerRequiredModsCount",
-			"helpText":"",
-			"returnTypeString":"int",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerRegion",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex"
-		},
-		{
-			"name":"NSGetServerRequiredModName",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex, int modIndex"
-		},
-		{
-			"name":"NSGetServerRequiredModVersion",
-			"helpText":"",
-			"returnTypeString":"string",
-			"argTypes":"int serverIndex, int modIndex"
+			"name": "NSGetGameServers",
+			"helpText": "Gets all fetched servers",
+			"returnTypeString": "array<ServerInfo>",
+			"argTypes": ""
 		},
 		{
 			"name":"NSClearRecievedServerList",

diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
@@ -1,7 +1,7 @@
 {
 	"Name": "Northstar.Client",
 	"Description": "Various ui and client changes to fix bugs and add better support for mods",
-	"Version": "1.13.0",
+	"Version": "1.14.0",
 	"LoadPriority": 0,
 	"InitScript": "cl_northstar_client_init.nut",
 	"ConVars": [
@@ -115,6 +115,17 @@
 			"RunOn": "UI"
 		},
 		{
+			"Path": "ui/ns_slider.nut",
+			"RunOn": "UI"
+		},
+		{
+			"Path": "ui/menu_mod_settings.nut",
+			"RunOn": "UI",
+			"UICallback":{
+				"Before": "AddModSettingsMenu"
+      		}
+    	},
+    	{
 			"Path": "ui/ui_mouse_capture.nut",
 			"RunOn": "UI"
 		}

diff --git a/Northstar.Client/mod/materials/vgui/reset.vmt b/Northstar.Client/mod/materials/vgui/reset.vmt
@@ -0,0 +1,12 @@
+"Basic"
+{
+	"$basetexture" "vgui/reset"
+	"$translucent" 1
+	"$vertexcolor" 1
+	"$vertexalpha" 1
+	"$no_fullbright" 1
+	"$ignorez" 1
+	"$nolod" 1
+
+	"$SHADERSRGBREAD360" 1
+}
diff --git a/Northstar.Client/mod/materials/vgui/reset.vtf b/Northstar.Client/mod/materials/vgui/reset.vtf
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -321,5 +321,26 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token"
 		"JSON_PARSE_ERROR" 				"Error parsing json response"
 		"UNSUPPORTED_VERSION" 			"The version you are using is no longer supported"
+
+		// Mod Settings
+		"MOD_SETTINGS"					"Mod Settings"
+		"NORTHSTAR_BASE_SETTINGS"		"Northstar Base Settings"
+		"ONLY_HOST_MATCH_SETTINGS"		"Only Host can change Private Match settings"
+		"ONLY_HOST_CAN_START_MATCH"		"Only Host can Start the Match"
+		"MATCH_COUNTDOWN_LENGTH"		"Private Match Countdown Duration"
+		"LOG_UNKNOWN_CLIENTCOMMANDS"	"Log Unknown Client Commands"
+		"DISALLOWED_TACTICALS"			"Prohibited Tacticals"
+		"TACTICAL_REPLACEMENT"			"Replacement Tactical"
+		"DISALLOWED_WEAPONS"			"Prohibited Weapons"
+		"REPLACEMENT_WEAPON"			"Replacement Weapon"
+		"SHOULD_RETURN_TO_LOBBY"		"Return To Lobby After Match End"
+		"ARE_YOU_SURE"					"Are you sure?"
+		"WILL_RESET_ALL_SETTINGS"		"This will reset ALL settings that belong to this category.\n\nThis is not revertable."
+		"WILL_RESET_SETTING"			"This will reset the %s1 setting to it's default value.\n\nThis is not revertable."
+		"MOD_SETTINGS_SERVER"			"Server"
+		"MOD_SETTINGS_RESET"			"Reset"
+		"MOD_SETTINGS_RESET_ALL"		"Reset All"
+		"NO_RESULTS"					"No results."
+		"NO_MODS"						"No settings available! Install more mods at ^5588FF00northstar.thunderstore.io^0."
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_french.txt b/Northstar.Client/mod/resource/northstar_client_localisation_french.txt
@@ -319,5 +319,23 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"INVALID_MASTERSERVER_TOKEN"     "Jeton du server maître invalide ou expiré"
 		"JSON_PARSE_ERROR"                 "Une erreur est survenue durant l'analyse JSON"
 		"UNSUPPORTED_VERSION"             "La version que vous utilisez n'est plus supportée"
+
+		"MOD_SETTINGS"                    "Paramètres de mod"
+		"NORTHSTAR_BASE_SETTINGS"        "Paramètres de base de Northstar"
+		"ONLY_HOST_MATCH_SETTINGS"        "Seul l'hôte peut changer les paramètres de match privé"
+		"ONLY_HOST_CAN_START_MATCH"        "Seul l'hôte peut lancer le match"
+		"MATCH_COUNTDOWN_LENGTH"        "Durée du compte à rebours de match privé"
+		"LOG_UNKNOWN_CLIENTCOMMANDS"    "Enregistrer les commandes client inconnues"
+		"DISALLOWED_TACTICALS"            "Capacités interdites"
+		"TACTICAL_REPLACEMENT"            "Capacités de remplacement"
+		"DISALLOWED_WEAPONS"            "Armes interdites"
+		"REPLACEMENT_WEAPON"            "Armes de remplacement"
+		"SHOULD_RETURN_TO_LOBBY"        "Retour au lobby après la fin du match"
+		"ARE_YOU_SURE"                    "Êtes-vous certain ?"
+		"WILL_RESET_ALL_SETTINGS"        "Ceci réinitialisera tous les paramètres de cette catégorie.\n\nCette action est irréversible."
+		"WILL_RESET_SETTING"            "Ceci réinitialisera le paramètre %s1 à sa valeur par défaut.\n\nCette action est irréversible."
+		"MOD_SETTINGS_SERVER"            "Serveur"
+		"MOD_SETTINGS_RESET"            "Réinitialiser"
+		"MOD_SETTINGS_RESET_ALL"        "Tout réinitialiser"
 	}
 }
diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt b/Northstar.Client/mod/resource/northstar_client_localisation_german.txt
@@ -310,5 +310,6 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü
 		"INVALID_MASTERSERVER_TOKEN"     "Ungültiger oder abgelaufener Token vom Masterserver"
 		"JSON_PARSE_ERROR"                 "Fehler beim Verarbeiten der JSON-Antwort"
 		"UNSUPPORTED_VERSION"             "Die Version die du benutzt ist nicht länger unterstützt"
+		"SNS_LEADER_BANKRUPT_SUB"             "%s1 Wurde Von %s2 Zurückgesetzt"
 	}
 }