Merge branch 'main' into feat/serverside-choice

R2Northstar · Sep 19, 2024 · a3c55f7 · a3c55f7
2 parents f7909ec + 3e00833
commit a3c55f7
Show file tree

Hide file tree

Showing 25 changed files with 2,549 additions and 1,013 deletions.
diff --git a/.github/labeler.yml b/.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: '**'
diff --git a/.github/nativefuncs.json b/.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":"",

diff --git a/.github/pull_request_template.md b/.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.
diff --git a/.github/workflows/auto-label-pr.yml b/.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
diff --git a/CONTRIBUTING.md b/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
diff --git a/Northstar.Client/mod.json b/Northstar.Client/mod.json
@@ -46,6 +46,10 @@
 			"Name": "modlist_reverse",
 			"DefaultValue": "0",
 			"Flags": "ARCHIVE_PLAYERPROFILE"
+		},
+		{
+			"Name": "modemenu_mode_filter",
+			"DefaultValue": "-1"
 		}
 	],
 	"Scripts": [

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_english.txt b/Northstar.Client/mod/resource/northstar_client_localisation_english.txt
@@ -324,6 +324,18 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"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^"
@@ -379,8 +391,8 @@ Press Yes if you agree to this. This choice can be changed in the mods menu at a
 		"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"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_german.txt b/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."

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_polish.txt b/Northstar.Client/mod/resource/northstar_client_localisation_polish.txt
@@ -46,7 +46,7 @@ Naciśnij Tak jeżeli wyrażasz zgodę. Wybór może zostać zmieniony w menu Mo
 		// mode settings
 		"MODE_SETTING_CATEGORY_PILOT" "Pilot"
 		"MODE_SETTING_CATEGORY_TITAN" "Tytan"
-		"MODE_SETTING_CATEGORY_RIFF" "Modyfikatory meczu"
+		"MODE_SETTING_CATEGORY_RIFF" "Modyfikatory rozgrywki"
 		"MODE_SETTING_CATEGORY_MATCH" "Mecz"
 
 		"classic_mp" "Klasyczny tryb wieloosobowy"

diff --git a/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt b/Northstar.Client/mod/resource/northstar_client_localisation_russian.txt
@@ -250,7 +250,7 @@
 		"UNAUTHORIZED_PWD"                       "Неправильный пароль"
 		"STRYDER_RESPONSE"                             "Не удалось разобрать ответ Stryder"
 		"PLAYER_NOT_FOUND"                           "Не удалось найти аккаунт игрока"
-		"INVALID_MASTERSERVER_TOKEN"    "Некорректный или истёкший токен главного сервера. Перезапустите EA App, чтобы обновить токен."
+		"INVALID_MASTERSERVER_TOKEN"    "Некорректный или истёкший токен главного сервера. Попробуйте перезапустить EA App."
 		"JSON_PARSE_ERROR"                              "Ошибка разбора json-ответа"
 		"UNSUPPORTED_VERSION"                    "Используемая вами версия больше не поддерживается"
 		"DISABLE"                    "Выключить"
@@ -367,5 +367,12 @@
 		"MOD_FETCHING_FAILED_GENERAL"                    "Ошибка распаковки мода. Проверьте файл лога, чтобы узнать подробности."
 		"MANIFESTO_FETCHING_TEXT"                    "Скачиваем список проверенных модов..."
 		"MANIFESTO_FETCHING_TITLE"                    "Начало загрузки модов"
+		"MODE_MENU_FFA"                    "Все против всех"
+		"MODE_MENU_OTHER"                    "Другое"
+		"MODE_MENU_CUSTOM"                    "Свой"
+		"MODE_MENU_ALL"                    "Все"
+		"MODE_MENU_UNKNOWN"                    "Неизвестный"
+		"MODE_MENU_SWITCH"                    "Фильтр"
+		"MODE_MENU_TITAN_ONLY"                    "Только титаны"
 	}
 }