Skip to content

Commit

Permalink
Merge branch 'main' into fixed-postmatch-deaths
Browse files Browse the repository at this point in the history
  • Loading branch information
Zanieon authored Sep 4, 2024
2 parents bbf8b18 + e66b164 commit 691c158
Show file tree
Hide file tree
Showing 17 changed files with 901 additions and 274 deletions.
18 changes: 18 additions & 0 deletions .github/nativefuncs.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
"returnTypeString":"void",
"argTypes":"string modName, bool enabled"
},
{
"name":"NSIsModRemote",
"helpText":"",
"returnTypeString":"bool",
"argTypes":"string modName"
},
{
"name":"NSGetModDescriptionByModName",
"helpText":"",
Expand Down Expand Up @@ -266,6 +272,12 @@
"returnTypeString":"void",
"argTypes":"string modName, bool enabled"
},
{
"name":"NSIsModRemote",
"helpText":"",
"returnTypeString":"bool",
"argTypes":"string modName"
},
{
"name":"NSGetModDescriptionByModName",
"helpText":"",
Expand Down Expand Up @@ -466,6 +478,12 @@
"returnTypeString":"void",
"argTypes":"string modName, bool enabled"
},
{
"name":"NSIsModRemote",
"helpText":"",
"returnTypeString":"bool",
"argTypes":"string modName"
},
{
"name":"NSGetModDescriptionByModName",
"helpText":"",
Expand Down
8 changes: 8 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion .github/workflows/compile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: windows-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: "mods"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/encoding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
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)
Expand All @@ -15,7 +15,7 @@ jobs:
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
50 changes: 50 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
"UNAUTHORIZED_PWD" "Password errata"
"STRYDER_RESPONSE" "Non è stato possibile analizzare la risposta di Stryder"
"PLAYER_NOT_FOUND" "Non è stato trovato l'account player"
"INVALID_MASTERSERVER_TOKEN" "Token Masterserver invalido o scaduto"
"INVALID_MASTERSERVER_TOKEN" "Token Masterserver invalido o scaduto, prova a riavviare l'App EA"
"JSON_PARSE_ERROR" "Errore nell'analisi della risposta json"
"UNSUPPORTED_VERSION" "La versione che stai usando non è più supportata"

Expand Down Expand Up @@ -380,5 +380,42 @@ Premi Sì se sei d'accordo. Questa scelta può essere modificata in qualsiasi mo
"sns_wme_kill_value" "Valore per uccisione Wingman d'Elite"
"sns_reset_kill_value" "Valore per uccisione Lama Impulsi/Esecuzione"
"PL_tffa_desc" "Ogni pilota per sè, distruggi tutti i titan nemici."
"player_force_respawn" "Respawn Forzato"
"PROGRESSION_TOGGLE_DISABLED_HEADER" "Attivare Progressione?"
"TOGGLE_PROGRESSION" "Attiva/Disattiva Progressione"
"Y_BUTTON_TOGGLE_PROGRESSION" "%[Y_BUTTON|]% Attiva/Disattiva Progressione"
"PROGRESSION_TOGGLE_ENABLED_HEADER" "Disattivare la Progressione?"
"AUTHENTICATION_FAILED_BODY" "Fallimento nell'autenticare con Atlas"
"AUTHENTICATION_FAILED_ERROR_CODE" "Codice di errore: ^DB6F2C00%s1^"
"AUTHENTICATION_FAILED_HELP" "Aiuto"
"AUTHENTICATION_FAILED_HEADER" "Autenticazione Fallita"
"MISSING_MOD" "Mod mancante \"%s1\" v%s2"
"MOD_NOT_VERIFIED" "(Mod non verificata, non è stato possibile il download automatico)"
"MOD_DL_DISABLED" "(Il download automatico delle mod è disabilitato)"
"DOWNLOADING_MOD_TEXT" "Download %s1 v%s2..."
"CHECKSUMING_TEXT" "Verifica contenuti %s1 v%s2..."
"EXTRACTING_MOD_TITLE" "Estrazione mod (%s1%)"
"FAILED_DOWNLOADING" "Download della mod fallito"
"NO_DISK_SPACE_AVAILABLE" "Non c'è abbastanza spazio sul disco."
"MOD_FETCHING_FAILED_GENERAL" "Estrazione mod fallita. Controlla i file di log per più dettagli."
"DOWNLOADING_MOD_TITLE" "Download mod in corso"
"DOWNLOADING_MOD_TITLE_W_PROGRESS" "Download in corso della mod (%s1%)"
"FAILED_READING_ARCHIVE" "C'è stato un errore durante la lettura dell'archivio della mod."
"FAILED_WRITING_TO_DISK" "C'è stato un errore durante l'estrazione della mod al filesystem."
"MOD_FETCHING_FAILED" "Impossibile scaricare l'archivio mod da Thunderstore."
"MOD_CORRUPTED" "La firma dell'archivio scaricato non corrisponde con quella verificata."
"DOWNLOADING_MOD_TEXT_W_PROGRESS" "Download %s1 v%s2...\n(%s3/%s4 MB)"
"EXTRACTING_MOD_TEXT" "Estraendo %s1 v%s2...\n(%s3/%s4 MB)"
"MOD_REQUIRED_WARNING" " : Questa mod potrebbe venire (non)caricata entrando in un server"
"PROGRESSION_ENABLED_HEADER" "Progressione Attivata!"
"PROGRESSION_ENABLED_BODY" "^CCCC0000La progessione è stata abilitata.^\n\nTitan, Armi, Fazioni, Skin, etc. dovranno essere sbloccate livellando, o comprate con i Meriti.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby multigiocatore."
"PROGRESSION_DISABLED_HEADER" "Progressione Disabilitata!"
"PROGRESSION_DISABLED_BODY" "^CCCC0000La progressione è stata disabilitata.^\n\nTitan, Armi, Fazioni, Skin, etc. saranno sbloccate e utilizzabili in qualsiasi momento.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby multigiocatore."
"WRONG_MOD_VERSION" "Il server ha la mod \"%s1\" v%s2 mentre tu hai v%s3"
"MANIFESTO_FETCHING_TITLE" "Iniziando download mod"
"MANIFESTO_FETCHING_TEXT" "Recuperando lista delle mod verificate..."
"PROGRESSION_TOGGLE_ENABLED_BODY" "Titan, Armi, Fazioni, Skin, etc. saranno tutti sbloccati e utilizzabili in ogni momento.\n\nQuesto può essere cambiato in qualsiasi momento nella lobby Multigiocatore."
"PROGRESSION_TOGGLE_DISABLED_BODY" "Titan, Armi, Factions, Skin, etc. avranno bisogno di essere sbloccate livellando, o comprate con i Meriti.\n\nQuesto può essere cambiato in ogni momento nella lobby Multiplayer.\n\n^CC000000Attenzione: se al momento hai equipaggiato degli item che non hai sbloccato, verranno resettati!"
"PROGRESSION_ANNOUNCEMENT_BODY" "^CCCC0000La progressione può essere abilitata ora!^\n\nNorthstar ora supporta la progressione vanilla, ciò significa che puoi scegliere di sbloccare Armi, Skin, Titan, etc. attraverso i livelli e le sfide.\n\nPuoi abilitare la progressione cliccando il pulsante in basso nella schermata lobby.\n\nQuesto può essere cambiato in qualsiasi momento."
}
}
Loading

0 comments on commit 691c158

Please sign in to comment.