Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/acemod/ACE3

Browse Source
This commit is contained in:
ViperMaul 2016-02-18 10:50:52 -08:00
commit 14c5558bbf
18 changed files with 115 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
CONTRIBUTING.md → .github/CONTRIBUTING.md vendored
View File

@ -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)

25
.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -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)*

10
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -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)

3
addons/cargo/stringtable.xml
View File

@ -136,12 +136,15 @@
</Key>
<Key ID="STR_ACE_Cargo_makeLoadable_displayName">
<English>Make Object Loadable</English>
<Polish>Ustaw jako ładowalny</Polish>
</Key>
<Key ID="STR_ACE_Cargo_makeLoadable_description">
<English>Sets the synced object as loadable by the cargo system.</English>
<Polish>Ustawia zsynchronizowany obiekt jako możliwy do załadowania poprzez system cargo</Polish>
</Key>
<Key ID="STR_ACE_Cargo_makeLoadable_setSize_displayName">
<English>Object's Size</English>
<Polish>Rozmiar obiektu</Polish>
</Key>
</Package>
</Project>

1
addons/common/stringtable.xml
View File

@ -764,6 +764,7 @@
</Key>
<Key ID="STR_ACE_Common_NoRoomToUnload">
<English>No Room to unload</English>
<Polish>Brak miejsca na rozładunek</Polish>
</Key>
</Package>
</Project>

43
addons/explosives/stringtable.xml
View File

@ -43,6 +43,7 @@
<Spanish>Detonar Todo</Spanish>
<Russian>Подрыв всех</Russian>
<Czech>Odpálit VŠE</Czech>
<Polish>Detonuj wszystkie</Polish>
</Key>
<Key ID="STR_ACE_Explosives_DetonateCode">
<English>Explosive code: %1</English>
@ -621,26 +622,28 @@
<Spanish>Este módulo ajusta las configuraciones relacionadas con explosivos.</Spanish>
</Key>
<Key ID="STR_ACE_Explosives_Module_SLAMBottomAttack_DisplayName">
<English>M6 SLAM Mine (Bottom Attack)</English>
<!-- <Czech>Mina M6 SLAM</Czech> -->
<!-- <French>Mine M6 SLAM</French> -->
<!-- <German>M6-SLAM-Mine</German> -->
<!-- <Italian>Mina M6 SLAM</Italian> -->
<!-- <Polish>Mina M6 SLAM</Polish> -->
<!-- <Portuguese>Mina SLAM M6</Portuguese> -->
<!-- <Russian>ПТ-мина M6 SLAM</Russian> -->
<!-- <Spanish>Mina M6 SLAM</Spanish> -->
<English>M6 SLAM Mine (Bottom Attack)</English>
<!-- <Czech>Mina M6 SLAM</Czech> -->
<!-- <French>Mine M6 SLAM</French> -->
<!-- <German>M6-SLAM-Mine</German> -->
<!-- <Italian>Mina M6 SLAM</Italian> -->
<!-- <Polish>Mina M6 SLAM</Polish> -->
<!-- <Portuguese>Mina SLAM M6</Portuguese> -->
<!-- <Russian>ПТ-мина M6 SLAM</Russian> -->
<!-- <Spanish>Mina M6 SLAM</Spanish> -->
<Polish>Mina M6 SLAM (atak od dołu)</Polish>
</Key>
<Key ID="STR_ACE_Explosives_Module_SLAMSideAttack_DisplayName">
<English>M6 SLAM Mine (Side Attack)</English>
<!-- <Czech>Mina M6 SLAM</Czech> -->
<!-- <French>Mine M6 SLAM</French> -->
<!-- <German>M6-SLAM-Mine</German> -->
<!-- <Italian>Mina M6 SLAM</Italian> -->
<!-- <Polish>Mina M6 SLAM</Polish> -->
<!-- <Portuguese>Mina SLAM M6</Portuguese> -->
<!-- <Russian>ПТ-мина M6 SLAM</Russian> -->
<!-- <Spanish>Mina M6 SLAM</Spanish> -->
<English>M6 SLAM Mine (Side Attack)</English>
<!-- <Czech>Mina M6 SLAM</Czech> -->
<!-- <French>Mine M6 SLAM</French> -->
<!-- <German>M6-SLAM-Mine</German> -->
<!-- <Italian>Mina M6 SLAM</Italian> -->
<!-- <Polish>Mina M6 SLAM</Polish> -->
<!-- <Portuguese>Mina SLAM M6</Portuguese> -->
<!-- <Russian>ПТ-мина M6 SLAM</Russian> -->
<!-- <Spanish>Mina M6 SLAM</Spanish> -->
<Polish>Mina M6 SLAM (atak od boku)</Polish>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDUrbanBig_Range_DisplayName">
<English>Large IED (Urban, Pressure Plate)</English>
@ -652,6 +655,7 @@
<!-- <Portuguese>AEI grande (urbano)</Portuguese> -->
<!-- <Russian>Большое СВУ (городское)</Russian> -->
<!-- <Spanish>IED grande (Urbano)</Spanish> -->
<Polish>Duży IED (miejski, płyta naciskowa)</Polish>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDLandBig_Range_DisplayName">
<English>Large IED (Dug-in, Pressure Plate)</English>
@ -663,6 +667,7 @@
<!-- <Portuguese>AEI grande (entrincheirado)</Portuguese> -->
<!-- <Russian>Большое СВУ (зарытое)</Russian> -->
<!-- <Spanish>IED grande (Enterrado)</Spanish> -->
<Polish>Duży IED (zakopany, płyta naciskowa)</Polish>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDUrbanSmall_Range_DisplayName">
<English>Small IED (Urban, Pressure Plate)</English>
@ -674,6 +679,7 @@
<!-- <Portuguese>AEI pequeno (urbano)</Portuguese> -->
<!-- <Russian>Малое СВУ (городское)</Russian> -->
<!-- <Spanish>IED pequeño (Urbano)</Spanish> -->
<Polish>Mały IED (miejski, płyta naciskowa)</Polish>
</Key>
<Key ID="STR_ACE_Explosives_Module_IEDLandSmall_Range_DisplayName">
<English>Small IED (Dug-in, Pressure Plate)</English>
@ -685,6 +691,7 @@
<!-- <Portuguese>AEI pequeno (entrincheirado)</Portuguese> -->
<!-- <Russian>Малое СВУ (зарытое)</Russian> -->
<!-- <Spanish>IED pequeño (Enterrado)</Spanish> -->
<Polish>Mały IED (zakopany, płyta naciskowa)</Polish>
</Key>
</Package>
</Project>

4
addons/gestures/stringtable.xml
View File

@ -218,18 +218,22 @@
<Key ID="STR_ACE_Gestures_showOnInteractionMenu_displayName">
<English>Show Gestures On Interaction Menu</English>
<Czech>Zobrazit posunky v interakčním menu</Czech>
<Polish>Pokaż gesty w menu interakcji</Polish>
</Key>
<Key ID="STR_ACE_Gestures_showOnInteractionMenu_description">
<English>Show gestures on the self interaction menu, or just use keybinds, or disable completely</English>
<Czech>Zobrazit posunky pro vlastní interakční menu, nebo prostě použít klávesové zkratky, nebo to zakázat úplně</Czech>
<Polish>Pokaż listę gestów w menu własnej interakcji, użyj tylko skrótów na klawiaturze lub wyłącz całkowicie</Polish>
</Key>
<Key ID="STR_ACE_Gestures_justKeybinds">
<English>Just Keybinds</English>
<Czech>Pouze klávesové zkratky</Czech>
<Polish>Tylko skróty klaw.</Polish>
</Key>
<Key ID="STR_ACE_Gestures_keysAndInteractionMenu">
<English>Keybinds + Interaction Menu</English>
<Czech>Klávesové zkratky + interakční menu</Czech>
<Polish>Skróty klaw. + menu interakcji</Polish>
</Key>
</Package>
</Project>

9
addons/headless/stringtable.xml
View File

@ -4,30 +4,37 @@
<Key ID="STR_ACE_Headless_Module">
<English>Headless</English>
<German>Headless</German>
<Polish>Headless</Polish>
</Key>
<Key ID="STR_ACE_Headless_ModuleDesc">
<English>This module allows you to setup automatic transferring of AI to Headless Clients. (Default: No)</English>
<German>Dieses Modul erlaubt es dir, die KI automatisch auf einen Headless Client zu transferieren. (Standard: Nein) </German>
<Polish>Moduł ten pozwala ustawić automatyczne przenoszenie AI do Headless Clientów. (Domyślnie: Nie)</Polish>
</Key>
<Key ID="STR_ACE_Headless_EnabledDesc">
<English>Enables transferring of AI to Headless Clients.</English>
<German>Aktiviert denTransfer der KI auf Headless Clients.</German>
<Polish>Aktywuje przenoszenie AI do Headless Clientów</Polish>
</Key>
<Key ID="STR_ACE_Headless_Delay">
<English>Delay</English>
<German>Verzögerung</German>
<Polish>Opóźnienie</Polish>
</Key>
<Key ID="STR_ACE_Headless_DelayDesc">
<English>Minimal delay between transfers, in seconds. (Default: 15)</English>
<German>Minimale Verzögerung zwischen Transfers in Sekunden. (Standard: 15)</German>
<Polish>Minimalne opóźnienie w sekundach pomiędzy transferami. (Domyślnie: 15)</Polish>
</Key>
<Key ID="STR_ACE_Headless_Log">
<English>Log</English>
<German>Protokolldatei anlegen</German>
<Polish>Dziennik</Polish>
</Key>
<Key ID="STR_ACE_Headless_LogDesc">
<English>Log transfer statistics and Headless Client (dis)connections to RPT. (Default: No)</English>
<German>Zeichnet Transferstatistiken, Verbindungen und Verbindungsabbrüche in einer RPT-Datei auf. (Standard: Nein)</German>
<Polish>Zapisuj statystyki transferów oraz status Headless Clienta do RPT. (Domyślnie: Nie)</Polish>
</Key>
</Package>
</Project>
</Project>

3
addons/interaction/stringtable.xml
View File

@ -351,6 +351,7 @@
</Key>
<Key ID="STR_ACE_Interaction_GetOut">
<English>Get Out</English>
<Polish>Wyjdź</Polish>
</Key>
<Key ID="STR_ACE_Interaction_TeamManagement">
<English>Team Management</English>
@ -735,4 +736,4 @@
<Czech>Zobrazit "interakci "podat zásobník"</Czech>
</Key>
</Package>
</Project>
</Project>

7
addons/inventory/stringtable.xml
View File

@ -29,36 +29,43 @@
<English>Backpacks</English>
<German>Rucksäcke</German>
<Czech>Batohy</Czech>
<Polish>Plecaki</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Headgear">
<English>Headgear</English>
<German>Kopfbedeckungen</German>
<Czech>Pokrývka hlavy</Czech>
<Polish>Hełmy</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Glasses">
<English>Glasses</English>
<German>Brillen</German>
<Czech>Brýle</Czech>
<Polish>Gogle</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Uniforms">
<English>Uniforms</English>
<German>Uniformen</German>
<Czech>Uniformy</Czech>
<Polish>Uniformy</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Vests">
<English>Vests</English>
<German>Westen</German>
<Czech>Vesty</Czech>
<Polish>Kamizelki</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Grenades">
<English>Grenades</English>
<German>Granaten</German>
<Czech>Granáty</Czech>
<Polish>Granaty</Polish>
</Key>
<Key ID="STR_ACE_Inventory_Medical">
<English>Medical</English>
<German>Sanimaterial</German>
<Czech>Lékařské vybavení</Czech>
<Polish>Medyczne</Polish>
</Key>
</Package>
</Project>

4
addons/nightvision/stringtable.xml
View File

@ -139,6 +139,7 @@
<Russian>Ночное виденье</Russian>
<Portuguese>Visão Noturna</Portuguese>
<Czech>Noční vidění</Czech>
<Polish>Noktowizja</Polish>
</Key>
<Key ID="STR_ACE_NightVision_Module_Description">
<English>Settings for night vision.</English>
@ -146,6 +147,7 @@
<Russian>Настройки ночного виденья</Russian>
<Portuguese>Ajustes para visão noturna.</Portuguese>
<Czech>Nastavení nočního vidění</Czech>
<Polish>Ustawienia noktowizorów</Polish>
</Key>
<Key ID="STR_ACE_NightVision_DisableNVGsWithSights_DisplayName">
<English>Disable NVGs in scope</English>
@ -153,6 +155,7 @@
<Russian>Убирать ПНВ при прицеливании</Russian>
<Portuguese>Desabilitar visão noturna nas lunetas</Portuguese>
<Czech>Zakázat NVG v zaměřovači</Czech>
<Polish>Wył. NVG przy celowaniu</Polish>
</Key>
<Key ID="STR_ACE_NightVision_DisableNVGsWithSights_Description">
<English>Blocks the usage of night vision goggles whilst aiming down the sight.</English>
@ -160,6 +163,7 @@
<Russian>Блокирует использование головного ПНВ при прицеливании через прицел.</Russian>
<Portuguese>Bloqueia o uso de visão noturna ao utilizar a mira.</Portuguese>
<Czech>Zabraňuje používání nokovizoru v režimu zaměřovače.</Czech>
<Polish>Uniemożliwia korzystanie z gogli noktowizyjnych przy celowaniu.</Polish>
</Key>
</Package>
</Project>

8
addons/overheating/stringtable.xml
View File

@ -27,21 +27,27 @@
</Key>
<Key ID="STR_ACE_Overheating_showParticleEffects_displayName">
<English>Overheating Particle Effects</English>
<Polish>Efekty cząsteczkowe przegrzania</Polish>
</Key>
<Key ID="STR_ACE_Overheating_showParticleEffects_description">
<English>Show particle effects when weapon overheats</English>
<Polish>Pokaż efekty cząsteczkowe kiedy broń się przegrzeje</Polish>
</Key>
<Key ID="STR_ACE_Overheating_showParticleEffectsForEveryone_displayName">
<English>Overheating Particle Effects for everyone</English>
<Polish>Pokaż efekty cząsteczkowe dla wszystkich</Polish>
</Key>
<Key ID="STR_ACE_Overheating_showParticleEffectsForEveryone_description">
<English>Show particle effects when other players weapon overheats</English>
<Polish>Pokazuje efekty cząsteczkowe kiedy broń innego gracza się przegrzeje</Polish>
</Key>
<Key ID="STR_ACE_Overheating_overheatingDispersion_displayName">
<English>Overheating Dispersion</English>
<Polish>Wpływ na rozrzut</Polish>
</Key>
<Key ID="STR_ACE_Overheating_overheatingDispersion_description">
<English>Overheated weapons will be less accurate and have decreased muzzle velocity. Applys for all players.</English>
<Polish>Przegrzane bronie będą mniej celne oraz będą miały zmniejszoną prędkość pocisku. Wpływa na wszystkich graczy.</Polish>
</Key>
<Key ID="STR_ACE_Overheating_SpareBarrelName">
<English>Spare barrel</English>
@ -188,4 +194,4 @@
<Russian>Температура</Russian>
</Key>
</Package>
</Project>
</Project>

1
addons/repair/stringtable.xml
View File

@ -685,6 +685,7 @@
<Key ID="STR_ACE_Repair_Hitera_1_hitpoint">
<English>ERA</English>
<Czech>ERA</Czech>
<Polish>ERA</Polish>
</Key>
<Key ID="STR_ACE_Repair_moduleName">
<English>Repair Settings</English>

1
addons/switchunits/stringtable.xml
View File

@ -17,6 +17,7 @@
<English>Trying to switch</English>
<German>Versuche zu Wechseln</German>
<Czech>Snažím se přehodit</Czech>
<Polish>Próba zmiany</Polish>
</Key>
<Key ID="STR_ACE_SwitchUnits_TooCloseToEnemy">
<English>This unit is too close to the enemy.</English>

14
addons/trenches/stringtable.xml
View File

@ -7,37 +7,47 @@
</Key>
<Key ID="STR_ACE_Trenches_EntrenchingToolDescription">
<English>Entrenching Tool</English>
<Polish>Saperka, używana do budowy okopów</Polish>
<Polish>Saperka, używana do budowy wnęk</Polish>
</Key>
<Key ID="STR_ACE_Trenches_EnvelopeSmallName">
<English>Envelope - Small</English>
<Polish>Wnęka - mała</Polish>
</Key>
<Key ID="STR_ACE_Trenches_EnevlopeSmallDescription">
<English>Small Personal Trench</English>
<Polish>Mała jednoosobowa wnęka</Polish>
</Key>
<Key ID="STR_ACE_Trenches_DigEnvelopeSmall">
<English>Dig Small Trench</English>
<Polish>Kop małą wnękę</Polish>
</Key>
<Key ID="STR_ACE_Trenches_EnvelopeBigName">
<English>Envelope - Big</English>
<Polish>Wnęka - duża</Polish>
</Key>
<Key ID="STR_ACE_Trenches_EnevlopeBigDescription">
<English>Large Personal Trench</English>
<Polish>Duża jednoosobowa wnęka</Polish>
</Key>
<Key ID="STR_ACE_Trenches_DigEnvelopeBig">
<English>Dig Big Trench</English>
<Polish>Kop dużą wnękę</Polish>
</Key>
<Key ID="STR_ACE_Trenches_ConfirmDig">
<English>Confirm Dig</English>
<Polish>Potwierdź kopanie</Polish>
</Key>
<Key ID="STR_ACE_Trenches_CancelDig">
<English>Cancel Dig</English>
<Polish>Anuluj kopanie</Polish>
</Key>
<Key ID="STR_ACE_Trenches_ScrollAction">
<English>+Ctrl rotate</English>
<Polish>+Ctrl obrót</Polish>
</Key>
<Key ID="STR_ACE_Trenches_DiggingTrench">
<English>Digging Trench</English>
<Polish>Kopanie okopu</Polish>
</Key>
</Package>
</Project>
</Project>

1
addons/viewdistance/stringtable.xml
View File

@ -237,6 +237,7 @@
<Russian>Зависит от зума</Russian>
<Portuguese>Baseado em FoV</Portuguese>
<Czech>Založeno na FoV</Czech>
<Polish>Oparty na FoV</Polish>
</Key>
<Key ID="STR_ACE_ViewDistance_infotext">
<English>View Distance:</English>

1
meta.cpp Normal file
View File

@ -0,0 +1 @@
publishedid = 463939057;

2
tools/make.py
View File

@ -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