Merge branch 'main' into http-fixes

.github/labeler.yml

@@ -0,0 +1,9 @@
+# Add 'needs code review' label to any changes within the entire repository
+needs code review:
+- changed-files:
+  - any-glob-to-any-file: '**'
+
+# Add 'needs testing' label to any changes within the entire repository
+needs testing:
+- changed-files:
+  - any-glob-to-any-file: '**'

.github/nativefuncs.json

@@ -18,6 +18,12 @@
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
+		{
+			"name":"NSIsModRemote",
+			"helpText":"",
+			"returnTypeString":"bool",
+			"argTypes":"string modName"
+		},
 		{
 			"name":"NSGetModDescriptionByModName",
 			"helpText":"",
@@ -266,6 +272,12 @@
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
+		{
+			"name":"NSIsModRemote",
+			"helpText":"",
+			"returnTypeString":"bool",
+			"argTypes":"string modName"
+		},
 		{
 			"name":"NSGetModDescriptionByModName",
 			"helpText":"",
@@ -466,6 +478,12 @@
 			"returnTypeString":"void",
 			"argTypes":"string modName, bool enabled"
 		},
+		{
+			"name":"NSIsModRemote",
+			"helpText":"",
+			"returnTypeString":"bool",
+			"argTypes":"string modName"
+		},
 		{
 			"name":"NSGetModDescriptionByModName",
 			"helpText":"",
@@ -502,6 +520,13 @@
 			"returnTypeString":"array<string>",
 			"argTypes":"string modName"
 		},
+		{
+			"name": "NSFetchVerifiedModsManifesto",
+			"helpText": "Retrieves the verified mods list from the central authority (GitHub).",
+			"returnTypeString": "void",
+			"argTypes": ""
+
+		},
 		{
 			"name": "NSIsModDownloadable",
 			"helpText": "checks whether a mod is verified and can be auto-downloaded",

.github/pull_request_template.md

@@ -16,3 +16,11 @@ Note that commit messages in PRs will generally be squashed to keep commit histo
 -->
 
 Replace this line with a description of your change (and screenshots/screenrecordings if applicable).
+
+### Code review:
+
+Replace this line with anything specific to look out for during code reviews.
+
+### Testing:
+
+Replace this line with instructions on how to test your pull request. The more detailed, the easier it is for reviewers to test, the faster your PR gets merged.

.github/workflows/auto-label-pr.yml

@@ -0,0 +1,14 @@
+name: Auto-Labeler
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5

.github/workflows/compile-check.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: "mods"
 

.github/workflows/encoding.yml

@@ -3,19 +3,19 @@ on: [push, pull_request]
 
 jobs:
   check-loc-encoding:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check localization files encoding
         run: |
           files=$(ls Northstar.Client/mod/resource/northstar_client_localisation_*.txt)
           IFS=$'\n'; files=($files); unset IFS; ! file --mime "${files[@]}" | grep -v "charset=utf-16le"
   check-missing-translations:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Look out for missing translations
         run: node .github/build/find-missing-translations.js
         continue-on-error: true

.github/workflows/merge-conflict-auto-label.yml

@@ -1,8 +1,11 @@
 name: Merge Conflict Auto Label
 on:
+  workflow_dispatch: # Manual run
   push:
     branches:
       - main
+  schedule:
+    - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
 
 jobs:
   triage:

CONTRIBUTING.md

@@ -0,0 +1,50 @@
+# Contributing
+> NOTE: This is the first iteration of this file. You're welcome to pull request changes
+
+### Contents
+- [Making issues](#Making-issues)
+- [Making pull requests](#Making-pull-requests)
+- [Formatting code](#Formatting-code)
+
+## Making issues
+When creating issues, whether to track a bug or suggest a feature, please try to follow this set of rules:
+1. When filing a bug report issue, please attach a log file ( Located in `R2Northstar/logs/` ).
+2. **Short, consise.** No-one wants to read an essay on why x should be added.
+3. When applicable attach a short video / screen shots to better convey what the issue is about.
+
+## Making pull requests
+When creating a pull request please follow this set of rules:
+1. **1 Fix/Feature should equal to 1 Pull Request.** The more you do in 1 PR the longer it'll take to merge.
+2. Mark your Pull Request as draft if it isnt finished just yet.
+3. Properly format your code. As we currently don't have a formatter we're very lax on this. That doesn't mean you don't have to try to format your code.
+4. **Mention how to test your changes / add a test mod to make it easier to test**
+
+## Formatting code
+A basic set of rules you should follow when creating a Pull Request
+
+### Comment your code
+- If you're adding a new file you should add a doc comment noting what the file does and its origin
+  ```cpp
+  ///-----------------------------------------------------------------------------
+  /// Origin: Northstar
+  /// Purpose: handles server-side rui
+  ///-----------------------------------------------------------------------------
+  ```
+  Alternative to `Origin: Northstar` would be `Origin: Respawn`
+- Each function should have a header doc comment
+  ```cpp
+  ///-----------------------------------------------------------------------------
+  /// Sends a string message to player
+  /// Returns true if it succeeded
+  ///-----------------------------------------------------------------------------
+  bool function NSSendInfoMessageToPlayer( entity player, string text )
+  ```
+### Functions
+- Functions should have spaces in the parentheses
+  ```cpp
+  bool function NSSendInfoMessageToPlayer( entity player, string text )
+  ```
+- If a function need to be threaded off using `thread` it should have a `_Threaded` suffix
+
+### File
+- Files should use tabs for indentation

Northstar.Client/keyvalues/resource/fontfiletable.txt

@@ -0,0 +1,10 @@
+FontFileTable
+{
+	"arial unicode ms"			"resource/Lato-Regular.ttf"
+
+	"lucida console"			"resource/NorthstarMono.ttf"			[$PC]
+
+	"arial"						"resource/Lato-Regular.ttf"
+	"arial bold"				"resource/Lato-Regular.ttf"
+	"arial narrow"				"resource/Lato-Regular.ttf"
+}

Northstar.Client/mod.json

@@ -46,6 +46,10 @@
 			"Name": "modlist_reverse",
 			"DefaultValue": "0",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
+		},
+		{
+			"Name": "modemenu_mode_filter",
+			"DefaultValue": "-1"
 		}
 	],
 	"Scripts": [

Northstar.Client/mod/resource/northstar_client_localisation_english.txt

@@ -320,10 +320,22 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"UNAUTHORIZED_PWD" 				"Wrong password"
 		"STRYDER_RESPONSE" 				"Couldn't parse stryder response"
 		"PLAYER_NOT_FOUND" 				"Couldn't find player account"
-		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token"
+		"INVALID_MASTERSERVER_TOKEN" 	"Invalid or expired masterserver token, try restarting EA App."
 		"JSON_PARSE_ERROR" 				"Error parsing json response"
 		"UNSUPPORTED_VERSION" 			"The version you are using is no longer supported"
 
+		// Mode menu
+		"MODE_MENU_PVPVE"		"PvPvE"
+		"MODE_MENU_PVE"			"PvE"
+		"MODE_MENU_PVP"			"PvP"
+		"MODE_MENU_FFA"			"FFA"
+		"MODE_MENU_TITAN_ONLY"	"Titan Only"
+		"MODE_MENU_OTHER"		"Other"
+		"MODE_MENU_CUSTOM"		"Custom"
+		"MODE_MENU_ALL"			"All"
+		"MODE_MENU_UNKNOWN"		"Unknown"
+		"MODE_MENU_SWITCH"		"Filter"
+
 		"AUTHENTICATION_FAILED_HEADER"		"Authentication Failed"
 		"AUTHENTICATION_FAILED_BODY"		"Failed to authenticate with Atlas!"
 		"AUTHENTICATION_FAILED_ERROR_CODE"	"Error code: ^DB6F2C00%s1^"
@@ -373,12 +385,14 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"WRONG_MOD_VERSION"					"Server has mod \"%s1\" v%s2 while you have v%s3"
 		"MOD_NOT_VERIFIED"					"(mod is not verified, and couldn't be downloaded automatically)"
 		"MOD_DL_DISABLED"					"(automatic mod downloading is disabled)"
+		"MANIFESTO_FETCHING_TITLE"			"Setting up mod download"
+		"MANIFESTO_FETCHING_TEXT"			"Retrieving the list of verified mods..."
 		"DOWNLOADING_MOD_TITLE"				"Downloading mod"
 		"DOWNLOADING_MOD_TITLE_W_PROGRESS" 	"Downloading mod (%s1%)"
 		"DOWNLOADING_MOD_TEXT"				"Downloading %s1 v%s2..."
 		"DOWNLOADING_MOD_TEXT_W_PROGRESS"	"Downloading %s1 v%s2...\n(%s3/%s4 MB)"
-		"CHECKSUMING_TITLE"					"Checksuming mod"
-		"CHECKSUMING_TEXT"					"Verifying contents of %s1 v%s2..."
+		"CHECKSUMING_TITLE"					"Verifying mod integrity"
+		"CHECKSUMING_TEXT"					"Validating files of %s1 v%s2..."
 		"EXTRACTING_MOD_TITLE"				"Extracting mod (%s1%)"
 		"EXTRACTING_MOD_TEXT"				"Extracting %s1 v%s2...\n(%s3/%s4 MB)"
 		"FAILED_DOWNLOADING"				"Failed downloading mod"

Northstar.Client/mod/resource/northstar_client_localisation_french.txt

@@ -316,7 +316,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"UNAUTHORIZED_PWD"                 "Mot de passe incorrect"
 		"STRYDER_RESPONSE"                 "Impossible d'analyser la réponse de Stryder"
 		"PLAYER_NOT_FOUND"                 "Impossible de trouver le compte du joueur"
-		"INVALID_MASTERSERVER_TOKEN"     "Jeton du server maître invalide ou expiré"
+		"INVALID_MASTERSERVER_TOKEN"     "Token du server maître invalide ou expiré, veuillez relancer l'application EA."
 		"JSON_PARSE_ERROR"                 "Une erreur est survenue durant l'analyse JSON"
 		"UNSUPPORTED_VERSION"             "La version que vous utilisez n'est plus supportée"
 
@@ -348,7 +348,7 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"PROGRESSION_ENABLED_HEADER"        "Progression activée !"
 		"PROGRESSION_DISABLED_HEADER"        "Progression désactivée !"
 		"PROGRESSION_DISABLED_BODY"        "^CCCC0000La progression a été désactivée.^\n\nLes Titans, Armes, Factions, Skins, et autres seront débloqués et utilisables en tout temps.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs."
-		"PROGRESSION_TOGGLE_DISABLED_BODY"        "Les Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs.\n\n^CC000000Warning : Si vous équiper des objets que vous n'avez pas encore débloqués, ils seront déséquipés !"
+		"PROGRESSION_TOGGLE_DISABLED_BODY"        "Les Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs.\n\n^CC000000Warning : Si vous équipez des objets que vous n'avez pas encore débloqués, ils seront déséquipés !"
 		"PROGRESSION_ENABLED_BODY"        "^CCCC0000La progression a été activée.^\n\nLes Titans, Armes, Factions, Skins et autres seront débloqués par la monté en niveau ou par leur achats en mérites.\n\nPeut être changé à n'importe que moment dans le salon multijoueurs."
 		"TOGGLE_PROGRESSION"        "Activer la progression"
 		"Y_BUTTON_TOGGLE_PROGRESSION"        "%[Y_BUTTON|]% Activer la progression"
@@ -357,5 +357,37 @@ Choisissez Oui si vous êtes d'accord. Ce choix peut être modifié à tout inst
 		"AUTHENTICATION_FAILED_HELP"        "Aide"
 		"AUTHENTICATION_FAILED_ERROR_CODE"        "Code d'erreur : ^DB6F2C00%s1^"
 		"AUTHENTICATION_FAILED_BODY"        "L'authentification avec Atlas a échoué."
+		"MISSING_MOD"        "Mod manquant \"%s1\" v%s2"
+		"MOD_REQUIRED_WARNING"        " : Ce mod peut être (dé)chargé automatiquement en rejoignant un serveur"
+		"EXTRACTING_MOD_TITLE"        "Extraction du mod (%s1%)"
+		"MOD_NOT_VERIFIED"        "(ce mod n'est pas vérifié, et n'a donc pas pu être automatiquement téléchargé)"
+		"MOD_DL_DISABLED"        "(le téléchargement automatique de mods est désactivé)"
+		"DOWNLOADING_MOD_TITLE"        "Téléchargement du mod"
+		"DOWNLOADING_MOD_TITLE_W_PROGRESS"        "Téléchargement du mod (%s1%)"
+		"DOWNLOADING_MOD_TEXT"        "Téléchargement de %s1 v%s2..."
+		"WRONG_MOD_VERSION"        "Le serveur requiert la version v%s2 du mod \"%s1\" (vous avez la version v%s3)"
+		"DOWNLOADING_MOD_TEXT_W_PROGRESS"        "Téléchargement de %s1 v%s2...\n(%s3/%s4 Mo)"
+		"CHECKSUMING_TITLE"        "Vérification de l'intégrité du mod"
+		"CHECKSUMING_TEXT"        "Vérification du contenu de %s1 v%s2..."
+		"EXTRACTING_MOD_TEXT"        "Extraction de %s1 v%s2...\n(%s3/%s4 Mo)"
+		"FAILED_DOWNLOADING"        "Echec du téléchargement du mod"
+		"FAILED_READING_ARCHIVE"        "Une erreur est survenue lors de la lecture de l'archive."
+		"FAILED_WRITING_TO_DISK"        "Une erreur est survenue lors de l'extraction des fichiers."
+		"MOD_FETCHING_FAILED"        "L'archive n'a pas pu être téléchargée depuis Thunderstore."
+		"MOD_CORRUPTED"        "La somme de contrôle de l'archive ne correspond pas à la signature vérifiée."
+		"NO_DISK_SPACE_AVAILABLE"        "L'espace restant sur votre disque est insuffisant."
+		"MOD_FETCHING_FAILED_GENERAL"        "L'extraction du mod a échoué. Consultez le journal pour plus d'informations."
+		"MANIFESTO_FETCHING_TITLE"        "Préparation du téléchargement du mod"
+		"MANIFESTO_FETCHING_TEXT"        "Récupération de la liste des mods vérifiés..."
+		"MODE_MENU_PVPVE"        "JcJcE"
+		"MODE_MENU_PVE"        "JcE"
+		"MODE_MENU_PVP"        "JcJ"
+		"MODE_MENU_FFA"        "Mêlée générale"
+		"MODE_MENU_OTHER"        "Autre"
+		"MODE_MENU_CUSTOM"        "Personnalisé"
+		"MODE_MENU_ALL"        "Tout"
+		"MODE_MENU_UNKNOWN"        "Inconnu"
+		"MODE_MENU_SWITCH"        "Filtre"
+		"MODE_MENU_TITAN_ONLY"        "Titan Uniquement"
 	}
 }

Northstar.Client/mod/resource/northstar_client_localisation_german.txt

@@ -17,9 +17,9 @@
 Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü ändern."
 		"BACK_AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
 		"AUTHENTICATION_AGREEMENT" "Authentifizierungs-Einwilligung"
-		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen"
+		"AUTHENTICATION_AGREEMENT_RESTART" "Ein Neustart ist notwendig, um diese Änderung zu übernehmen."
 
-		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server"
+		"DIALOG_AUTHENTICATING_MASTERSERVER" "Authentifizierung mit Master Server."
 		"AUTHENTICATIONAGREEMENT_NO" "Du hast dich gegen die Authentifizierung mit Northstar entschieden. Du kannst die Authentifizierungs-Einwilligung im Modmenü ansehen."
 
 		"MENU_TITLE_SERVER_BROWSER" "Server Browser"
@@ -320,7 +320,7 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"SHOW_ONLY_NOT_REQUIRED"             "Nur optionale Mods"
 		"SHOW_ONLY_REQUIRED"             "Nur notwendige Mods"
 		"PROGRESSION_TOGGLE_DISABLED_HEADER"             "Fortschritt aktivieren?"
-		"TOGGLE_PROGRESSION"             "Fortschritt zuschalten"
+		"TOGGLE_PROGRESSION"             "Fortschritt umschalten"
 		"PROGRESSION_TOGGLE_ENABLED_HEADER"             "Fortschritt deaktivieren?"
 		"PROGRESSION_TOGGLE_ENABLED_BODY"             "Titans, Waffen, Fraktionen, Skins, usw werden freigeschaltet und sind zu jeder Zeit verfügbar .\n\nDies kann in der Mehrspielerlobby zu jedem Zeitpunkt geändert werden."
 		"MATCH_COUNTDOWN_LENGTH"             "Countdown für privates Match"
@@ -357,7 +357,7 @@ Drücke Ja, um zuzustimmen. Du kannst diese Entscheidung jederzeit im Modmenü 
 		"PROGRESSION_DISABLED_HEADER"             "Fortschritt deaktiviert!"
 		"WILL_RESET_ALL_SETTINGS"             "Dadurch werden ALLE Einstellungen, die zu dieser Kategorie gehören, zurückgesetzt.\n\nDies kann nicht rückgängig gemacht werden."
 		"WILL_RESET_SETTING"             "Dies setzten die Einstellungen %s1 auf deren Ursprungeswert zurück.\n\nDies kann nicht rückgängig gemacht werden."
-		"Y_BUTTON_TOGGLE_PROGRESSION"             "%[Y_BUTTON|]% Fortschritt zuschalten."
+		"Y_BUTTON_TOGGLE_PROGRESSION"             "%[Y_BUTTON|]% Fortschritt umschalten"
 		"PROGRESSION_TOGGLE_DISABLED_BODY"             "Titans, Waffen, Fraktionen, Skins usw. müssen durch Levelaufstieg freigeschaltet oder mit Verdiensten gekauft werden.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden.\n\n^CC000000Warnung: Wenn Sie derzeit ausgerüstete Gegenstände besitzen, die Sie nicht freigeschaltet haben, werden diese zurückgesetzt!"
 		"PROGRESSION_ENABLED_BODY"             "^CCCC0000Fortschritt wurde aktiviert.^\n\nTitans, Waffen, Fraktionen, Skins usw. müssen durch Levelaufstieg freigeschaltet oder mit Verdiensten gekauft werden.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden."
 		"PROGRESSION_DISABLED_BODY"             "^CCCC0000Fortschritt wurde deaktiviert.^\n\nTitans, Waffen, Fraktionen, Skins usw. werden alle freigeschaltet und jederzeit nutzbar sein.\n\nDies kann jederzeit in der Mehrspieler-Lobby geändert werden."