diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 52% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md index ed17a41e67..33ae67cc0e 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Before reporting -If you have found an issue with ACE3 please make sure that ACE3 is really the cause of the problem. To do this try to reproduce the issue with using only `@CBA_A3` and `@ace` on a newly created mission. +If you have found an issue with ACE3 please make sure that ACE3 really is the cause of the problem. To do this try to reproduce the issue with using only `@CBA_A3` and `@ace` on a newly created mission. Indicate if the issue appears on stable or development version. In case it is the development version, please also include the commit SHA-1 hash. @@ -14,38 +14,10 @@ Indicate if the issue appears on stable or development version. In case it is th ## Reporting the issue -Head over to the [ACE3 GitHub issue tracker](https://github.com/acemod/ACE3/issues) and press the [New issue](https://github.com/acemod/ACE3/issues/new) button in the top right corner. Add a descriptive title and copy the following issue template in to the text area: - -``` -ACE3 Version: 3.x.x -(indicate if stable or dev, if dev indicate the commit the version is based on) - -**Mods:** -* `@CBA_A3` -* `@ace` - -**Placed ACE3 Modules:** -* *Add the list of modules you have placed on the map. Use 'None' if the error occurs without using any modules.* -* You can also press the `Debug to` button in the ACE3 option menu (escape -> ACE3 options -> Debug to) and add a link (pastebin.com) to the results. - -**Description:** -* Add a detailed description of the error. This makes it easier for us to fix the issue.* - -**Steps to reproduce:** -* *Add the steps needed to reproduce the issue.* - -**Where did the issue occur?** -* A possible answer might be "Multiplayer", "Editor" or "Singleplayer"* - -**RPT log file:** -* Add a link (pastebin.com) to the client or server RPT file.* -``` +Head over to the [ACE3 GitHub issue tracker](https://github.com/acemod/ACE3/issues) and press the [New issue](https://github.com/acemod/ACE3/issues/new) button in the top right corner. Add a descriptive title and complete the issue template. A video of the issue might be helpful in resolving it faster. -GitHub uses [Markdown](http://daringfireball.net/projects/markdown/syntax) to style the output. If you want to know more about it (e.g. how to [turn text bold](https://help.github.com/articles/markdown-basics/#styling-text), how to denote [code blocks](https://help.github.com/articles/markdown-basics/#inline-formats) or [inline code](https://help.github.com/articles/markdown-basics/#multiple-lines)) have a look at the [GitHub Markdown Documentation](https://help.github.com/articles/github-flavored-markdown). - - # Feature Requests ## Background @@ -57,8 +29,3 @@ Please refrain from making requests for any planned or existing features from ei In order to avoid duplicates and keep the issue tracker organized, we have created a common issue for [ACE3 Feature requests](https://github.com/acemod/ACE3/issues/414). Any and all relevant requests should be submitted there, where they will also get discussed and evaluated. Before adding a new one, make sure to check the previous entries from the thread and do a quick search for similar suggestions; please don't reiterate requests for features that had already been accepted for inclusion, or those which were disregarded earlier. Following their approval, feature requests may be moved by moderators to a separate issue for further discussion. - -# Regarding Pull Requests (PRs) -- You want to help but don't know where to start? Check the wiki entry for [setting up the development environment](http://ace3mod.com/wiki/development/setting-up-the-development-environment.html) -- [Make sure to respect the file structure](http://ace3mod.com/wiki/development/modularity-and-pbo-structure.html) -- [Make sure to respect the coding guidelines](http://ace3mod.com/wiki/development/coding-guidelines.html) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000000..92ba3070ce --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,25 @@ +**Arma 3 Version:** `x.xx` +*(indicate if stable, rc or dev*) + +**ACE3 Version:** `3.x.x` +*(indicate if stable or dev, if dev indicate the commit the version is based on)* + +**Mods:** +* `@CBA_A3` +* `@ace` +* ... + +**Placed Modules:** +* *Add the list of modules you have placed on the map. Use 'None' if the error occurs without using any modules.* + +**Description:** +* *Add a detailed description of the error. This makes it easier for us to fix the issue.* + +**Steps to reproduce:** +* *Add the steps needed to reproduce the issue.* + +**Where did the issue occur?** +* *A possible answer might be "Dedicated Server", "Local Multiplayer", "Editor", or "Singleplayer"* + +**RPT log file:** +* *Add a link (pastebin.com) to the client and/or server RPT file. An instruction to find your RPT files can be [found here](https://community.bistudio.com/wiki/Crash_Files#Arma_3)* diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..982d6137ef --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,10 @@ +### When merged this pull request will: + +1. *Describe what this pull request will do* +2. *Each change in a seperate line* + +--- +*Delete this line and everything below* + +- [Make sure to respect the file structure](http://ace3mod.com/wiki/development/modularity-and-pbo-structure.html) +- [Make sure to respect the coding guidelines](http://ace3mod.com/wiki/development/coding-guidelines.html) diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml index bfa67edfa3..73f71fc527 100644 --- a/addons/cargo/stringtable.xml +++ b/addons/cargo/stringtable.xml @@ -136,12 +136,15 @@ Make Object Loadable + Ustaw jako ładowalny Sets the synced object as loadable by the cargo system. + Ustawia zsynchronizowany obiekt jako możliwy do załadowania poprzez system cargo Object's Size + Rozmiar obiektu \ No newline at end of file diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 17f9e6a918..920d6c76b7 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -764,6 +764,7 @@ No Room to unload + Brak miejsca na rozładunek \ No newline at end of file diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml index 83af057d7c..14d927c73f 100644 --- a/addons/explosives/stringtable.xml +++ b/addons/explosives/stringtable.xml @@ -43,6 +43,7 @@ Detonar Todo Подрыв всех Odpálit VŠE + Detonuj wszystkie Explosive code: %1 @@ -621,26 +622,28 @@ Este módulo ajusta las configuraciones relacionadas con explosivos. - M6 SLAM Mine (Bottom Attack) - - - - - - - - + M6 SLAM Mine (Bottom Attack) + + + + + + + + + Mina M6 SLAM (atak od dołu) - M6 SLAM Mine (Side Attack) - - - - - - - - + M6 SLAM Mine (Side Attack) + + + + + + + + + Mina M6 SLAM (atak od boku) Large IED (Urban, Pressure Plate) @@ -652,6 +655,7 @@ + Duży IED (miejski, płyta naciskowa) Large IED (Dug-in, Pressure Plate) @@ -663,6 +667,7 @@ + Duży IED (zakopany, płyta naciskowa) Small IED (Urban, Pressure Plate) @@ -674,6 +679,7 @@ + Mały IED (miejski, płyta naciskowa) Small IED (Dug-in, Pressure Plate) @@ -685,6 +691,7 @@ + Mały IED (zakopany, płyta naciskowa) \ No newline at end of file diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml index c3974ff144..df9a1b0467 100644 --- a/addons/gestures/stringtable.xml +++ b/addons/gestures/stringtable.xml @@ -218,18 +218,22 @@ Show Gestures On Interaction Menu Zobrazit posunky v interakčním menu + Pokaż gesty w menu interakcji Show gestures on the self interaction menu, or just use keybinds, or disable completely Zobrazit posunky pro vlastní interakční menu, nebo prostě použít klávesové zkratky, nebo to zakázat úplně + Pokaż listę gestów w menu własnej interakcji, użyj tylko skrótów na klawiaturze lub wyłącz całkowicie Just Keybinds Pouze klávesové zkratky + Tylko skróty klaw. Keybinds + Interaction Menu Klávesové zkratky + interakční menu + Skróty klaw. + menu interakcji \ No newline at end of file diff --git a/addons/headless/stringtable.xml b/addons/headless/stringtable.xml index 4bea985f9f..8909fa8187 100644 --- a/addons/headless/stringtable.xml +++ b/addons/headless/stringtable.xml @@ -4,30 +4,37 @@ Headless Headless + Headless This module allows you to setup automatic transferring of AI to Headless Clients. (Default: No) Dieses Modul erlaubt es dir, die KI automatisch auf einen Headless Client zu transferieren. (Standard: Nein) + Moduł ten pozwala ustawić automatyczne przenoszenie AI do Headless Clientów. (Domyślnie: Nie) Enables transferring of AI to Headless Clients. Aktiviert denTransfer der KI auf Headless Clients. + Aktywuje przenoszenie AI do Headless Clientów Delay Verzögerung + Opóźnienie Minimal delay between transfers, in seconds. (Default: 15) Minimale Verzögerung zwischen Transfers in Sekunden. (Standard: 15) + Minimalne opóźnienie w sekundach pomiędzy transferami. (Domyślnie: 15) Log Protokolldatei anlegen + Dziennik Log transfer statistics and Headless Client (dis)connections to RPT. (Default: No) Zeichnet Transferstatistiken, Verbindungen und Verbindungsabbrüche in einer RPT-Datei auf. (Standard: Nein) + Zapisuj statystyki transferów oraz status Headless Clienta do RPT. (Domyślnie: Nie) - + \ No newline at end of file diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml index aa0ee78773..e778b333dd 100644 --- a/addons/interaction/stringtable.xml +++ b/addons/interaction/stringtable.xml @@ -351,6 +351,7 @@ Get Out + Wyjdź Team Management @@ -735,4 +736,4 @@ Zobrazit "interakci "podat zásobník" - + \ No newline at end of file diff --git a/addons/inventory/stringtable.xml b/addons/inventory/stringtable.xml index f2170e62be..693feda9cc 100644 --- a/addons/inventory/stringtable.xml +++ b/addons/inventory/stringtable.xml @@ -29,36 +29,43 @@ Backpacks Rucksäcke Batohy + Plecaki Headgear Kopfbedeckungen Pokrývka hlavy + Hełmy Glasses Brillen Brýle + Gogle Uniforms Uniformen Uniformy + Uniformy Vests Westen Vesty + Kamizelki Grenades Granaten Granáty + Granaty Medical Sanimaterial Lékařské vybavení + Medyczne \ No newline at end of file diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml index 6478b2d847..2815f6d6ae 100644 --- a/addons/nightvision/stringtable.xml +++ b/addons/nightvision/stringtable.xml @@ -139,6 +139,7 @@ Ночное виденье Visão Noturna Noční vidění + Noktowizja Settings for night vision. @@ -146,6 +147,7 @@ Настройки ночного виденья Ajustes para visão noturna. Nastavení nočního vidění + Ustawienia noktowizorów Disable NVGs in scope @@ -153,6 +155,7 @@ Убирать ПНВ при прицеливании Desabilitar visão noturna nas lunetas Zakázat NVG v zaměřovači + Wył. NVG przy celowaniu Blocks the usage of night vision goggles whilst aiming down the sight. @@ -160,6 +163,7 @@ Блокирует использование головного ПНВ при прицеливании через прицел. Bloqueia o uso de visão noturna ao utilizar a mira. Zabraňuje používání nokovizoru v režimu zaměřovače. + Uniemożliwia korzystanie z gogli noktowizyjnych przy celowaniu. \ No newline at end of file diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml index 646a24fb88..dd06dde8bd 100644 --- a/addons/overheating/stringtable.xml +++ b/addons/overheating/stringtable.xml @@ -27,21 +27,27 @@ Overheating Particle Effects + Efekty cząsteczkowe przegrzania Show particle effects when weapon overheats + Pokaż efekty cząsteczkowe kiedy broń się przegrzeje Overheating Particle Effects for everyone + Pokaż efekty cząsteczkowe dla wszystkich Show particle effects when other players weapon overheats + Pokazuje efekty cząsteczkowe kiedy broń innego gracza się przegrzeje Overheating Dispersion + Wpływ na rozrzut Overheated weapons will be less accurate and have decreased muzzle velocity. Applys for all players. + Przegrzane bronie będą mniej celne oraz będą miały zmniejszoną prędkość pocisku. Wpływa na wszystkich graczy. Spare barrel @@ -188,4 +194,4 @@ Температура - + \ No newline at end of file diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml index b79f25bd65..d14eddc68c 100644 --- a/addons/repair/stringtable.xml +++ b/addons/repair/stringtable.xml @@ -685,6 +685,7 @@ ERA ERA + ERA Repair Settings diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml index 8403c5c726..41053361d8 100644 --- a/addons/switchunits/stringtable.xml +++ b/addons/switchunits/stringtable.xml @@ -17,6 +17,7 @@ Trying to switch Versuche zu Wechseln Snažím se přehodit + Próba zmiany This unit is too close to the enemy. diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml index f4e88c2bb2..9ca5d17eb1 100644 --- a/addons/trenches/stringtable.xml +++ b/addons/trenches/stringtable.xml @@ -7,37 +7,47 @@ Entrenching Tool - Saperka, używana do budowy okopów + Saperka, używana do budowy wnęk Envelope - Small + Wnęka - mała Small Personal Trench + Mała jednoosobowa wnęka Dig Small Trench + Kop małą wnękę Envelope - Big + Wnęka - duża Large Personal Trench + Duża jednoosobowa wnęka Dig Big Trench + Kop dużą wnękę Confirm Dig + Potwierdź kopanie Cancel Dig + Anuluj kopanie +Ctrl rotate + +Ctrl obrót Digging Trench + Kopanie okopu - + \ No newline at end of file diff --git a/addons/viewdistance/stringtable.xml b/addons/viewdistance/stringtable.xml index 622f94d8ab..0e524f6c7a 100644 --- a/addons/viewdistance/stringtable.xml +++ b/addons/viewdistance/stringtable.xml @@ -237,6 +237,7 @@ Зависит от зума Baseado em FoV Založeno na FoV + Oparty na FoV View Distance: diff --git a/meta.cpp b/meta.cpp new file mode 100644 index 0000000000..fad888e119 --- /dev/null +++ b/meta.cpp @@ -0,0 +1 @@ +publishedid = 463939057; diff --git a/tools/make.py b/tools/make.py index ed18085ef0..5ae82c8ff9 100644 --- a/tools/make.py +++ b/tools/make.py @@ -73,7 +73,7 @@ dssignfile = "" prefix = "ace" pbo_name_prefix = "ace_" signature_blacklist = ["ace_server.pbo"] -importantFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "AUTHORS.txt", "LICENSE", "logo_ace3_ca.paa"] +importantFiles = ["mod.cpp", "README.md", "docs\\README_DE.md", "docs\\README_PL.md", "AUTHORS.txt", "LICENSE", "logo_ace3_ca.paa", "meta.cpp"] versionFiles = ["README.md", "docs\\README_DE.md", "docs\\README_PL.md", "mod.cpp"] ciBuild = False # Used for CI builds