Merge pull request #2 from acemod/master

Update to current version of ace 3
acemod · May 1, 2015 · e394a1a · e394a1a
2 parents 864c3ea + 8016262
commit e394a1a
Show file tree

Hide file tree

Showing 262 changed files with 2,820 additions and 1,428 deletions.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -43,7 +43,7 @@ evromalarkey <evromalarkey@gmail.com>
 Falke75
 Ferenczi
 Ferenzi
-Filip Basara <filip.basara93@googlemail.com> (Logo)
+Filip Basara <filip.basara93@googlemail.com>
 FreeZbe <freeseb@gmail.com>
 geraldbolso1899
 Ghost
@@ -87,3 +87,5 @@ Kavinsky <nmunozfernandez@gmail.com>
 Coren <coren4@gmail.com>
 OnkelDisMaster <onkeldismaster@gmail.com>
 Dimaslg <dimaslg@telecable.e>
+VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
+Bla1337 <t3hslowpoke@gmail.com>
diff --git a/ace_breakLine.dll → ace_break_line.dll b/ace_breakLine.dll → ace_break_line.dll
diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -24,7 +24,7 @@ GVAR(currentGrid) = 0;
 GVAR(INIT_MESSAGE_ENABLED) = false;
 
 GVAR(extensionAvailable) = true;
-/* @TODO: Remove this until verisoning is in sync with cmake/build versioning
+/* @TODO: Remove this until versioning is in sync with cmake/build versioning
 GVAR(extensionVersion) = ("ace_advanced_ballistics" callExtension "version");
 GVAR(extensionAvailable) = (GVAR(extensionVersion) == EXTENSION_REQUIRED_VERSION);
 if (!GVAR(extensionAvailable)) exitWith {

diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -47,7 +47,7 @@ if (GVAR(onlyActiveForLocalPlayers) && !(local _unit)) then {
         _abort = true;
     };
 };
-//if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // TODO: We currently do not have firedEHs on vehicles
+//if (!GVAR(vehicleGunnerEnabled) && !(_unit isKindOf "Man")) then { _abort = true; }; // We currently do not have firedEHs on vehicles
 if (GVAR(disabledInFullAutoMode) && getNumber(configFile >> "cfgWeapons" >> _weapon >> _mode >> "autoFire") == 1) then { _abort = true; };
 
 if (_abort || !(GVAR(extensionAvailable))) exitWith {

diff --git a/addons/advanced_ballistics/initKeybinds.sqf b/addons/advanced_ballistics/initKeybinds.sqf
@@ -1,4 +1,4 @@
-["ACE3", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey",
+["ACE3 Equipment", QGVAR(ProtractorKey), localize "STR_ACE_AdvancedBallistics_ProtractorKey",
 {
     // Conditions: canInteract
     if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};

diff --git a/addons/advanced_ballistics/stringtable.xml b/addons/advanced_ballistics/stringtable.xml
@@ -9,6 +9,7 @@
             <French>Afficher les info sur le vent</French>
             <Spanish>Mostrar información del viento</Spanish>
             <German>Windinformationen anzeigen</German>
+            <Hungarian>Széladatok mutatása</Hungarian>
         </Key>
         <Key ID="STR_ACE_AdvancedBallistics_ProtractorKey">
             <English>Show Protractor</English>
@@ -18,6 +19,7 @@
             <French>Afficher le rapporteur</French>
             <Spanish>Mostrar transportador</Spanish>
             <German>Winkelmesser anzeigen</German>
+            <Hungarian>Szögmérő mutatása</Hungarian>
         </Key>
     </Package>
 </Project>
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Aircraft">
         <Key ID="STR_ACE_Aircraft_CMFlareLauncher_Burst_Name">
@@ -35,6 +35,7 @@
             <Hungarian>Rakodórámpa nyitása</Hungarian>
             <Russian>Открыть грузовой отсек</Russian>
             <Italian>Apri la porta del cargo</Italian>
+            <Portuguese>Abrir porta de carga</Portuguese>
         </Key>
         <Key ID="STR_ACE_Aircraft_CloseCargoRamp">
             <English>Close Cargo Door</English>
@@ -46,6 +47,7 @@
             <Hungarian>Rakodórámpa zárása</Hungarian>
             <Russian>Закрыть грузовой отсек</Russian>
             <Italian>Chiudi la porta del cargo</Italian>
+            <Portuguese>Fechar porta de carga</Portuguese>
         </Key>
     </Package>
-</Project>
+</Project>
diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf
@@ -1,8 +1,8 @@
-["ACE3", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey",
+["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize "STR_ACE_ATragMX_ATragMXDialogKey",
 {
     // Conditions: canInteract
     if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
-    
+
     // Statement
     [] call FUNC(create_dialog);
     false

diff --git a/addons/atragmx/stringtable.xml b/addons/atragmx/stringtable.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="ATragMX">
         <Key ID="STR_ACE_ATragMX_Name">
@@ -20,14 +20,18 @@
             <Spanish>Abrir ATragMX</Spanish>
             <French>Ouvrir ATragMX</French>
             <German>ATragMX öffnen</German>
+            <Italian>Apri ATragMX</Italian>
+            <Hungarian>ATragMX elővétele</Hungarian>
         </Key>
         <Key ID="STR_ACE_ATragMX_Description">
             <English>Rugged PDA with ATragMX</English>
             <Polish>Przenośny PDA z kalkulatorem balistycznym ATragMX</Polish>
             <Russian>Защищенный КПК с ATragMX</Russian>
             <Spanish>PDA rugerizada con ATragMX</Spanish>
             <German>Robuster PDA mit ATragMX</German>
-            <French>PDA robuste avec ATragMX</French>
+            <French>PDA avec ATragMX</French>
+            <Italian>PDA Robusto con ATragMX</Italian>
+            <Hungarian>Megerősített PDA, ATragMX-el</Hungarian>
         </Key>
         <Key ID="STR_ACE_ATragMX_ATragMXDialogKey">
             <English>Open ATragMX</English>
@@ -36,6 +40,8 @@
             <Spanish>Abrir ATragMX</Spanish>
             <French>Ouvrir ATragMX</French>
             <German>ATragMX öffnen</German>
+            <Italian>Apri ATragMX</Italian>
+            <Hungarian>ATragMX elővétele</Hungarian>
         </Key>
     </Package>
-</Project>
+</Project>
diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
@@ -176,8 +176,10 @@
             <Russian>Не удалось присоединить</Russian>
             <Spanish>Error al acoplar</Spanish>
             <Czech>Připnutí selhalo</Czech>
+            <Portuguese>Erro ao anexar</Portuguese>
             <Polish>Przyczepianie nie powiodło się</Polish>
             <Hungarian>Hozzácsatolás sikertelen</Hungarian>
+            <Italian>Impossibile Attaccare</Italian>
         </Key>
         <Key ID="STR_ACE_Attach_Item_Attached">
             <English>%1&lt;br/&gt;Attached</English>

diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp
@@ -322,13 +322,14 @@ class CfgMagazines {
     class 10Rnd_762x54_Mag: 10Rnd_762x51_Mag {
         initSpeed = 800;
     };
-    class ACE_10Rnd_762x54_Tracer_mag: 16Rnd_9x21_Mag {
+    class ACE_10Rnd_762x54_Tracer_mag: 10Rnd_762x54_Mag {
         author = "$STR_ACE_Common_ACETeam";
         ammo = "ACE_762x54_Ball_7T2";
         displayName = "$STR_ACE_10Rnd_762x54_Tracer_mag_Name";
         displayNameShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_NameShort";
         descriptionShort = "$STR_ACE_10Rnd_762x54_Tracer_mag_Description";
         initSpeed = 800;
+        tracersEvery = 1;
     };
 
     class 150Rnd_762x54_Box: 150Rnd_762x51_Box {

diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp
@@ -42,6 +42,7 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_338_300gr_HPBT_Mag,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_338_API526_Mag,4);
@@ -59,6 +60,7 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_SD,3);
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_M993_AP_Mag,4);
@@ -82,6 +84,7 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
         };
     };
@@ -200,6 +203,7 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk316_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_10Rnd_762x51_Mk319_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mk319_Mod_0_Mag,4);
+            MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x51_Mag_Tracer_Dim,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_0_Mag,4);
             MACRO_ADDMAGAZINE(ACE_20Rnd_762x67_Mk248_Mod_1_Mag,4);

diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
@@ -509,6 +509,7 @@ class CfgWeapons {
     class srifle_EBR_F: EBR_base_F {
         magazines[] = {
             "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
             "ACE_20Rnd_762x51_Mag_Tracer_Dim",
             "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
             "ACE_20Rnd_762x51_M118LR_Mag",
@@ -560,6 +561,7 @@ class CfgWeapons {
     class srifle_DMR_03_F: DMR_03_base_F {
         magazines[] = {
             "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
             "ACE_20Rnd_762x51_Mag_Tracer_Dim",
             "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
             "ACE_20Rnd_762x51_M118LR_Mag",
@@ -584,6 +586,7 @@ class CfgWeapons {
     class srifle_DMR_06_camo_F: DMR_06_base_F {
         magazines[] = {
             "20Rnd_762x51_Mag",
+            "ACE_20Rnd_762x51_Mag_Tracer",
             "ACE_20Rnd_762x51_Mag_Tracer_Dim",
             "ACE_20Rnd_762x51_Mk316_Mod_0_Mag",
             "ACE_20Rnd_762x51_M118LR_Mag",

diff --git a/addons/ballistics/scripts/initTargetWall.sqf b/addons/ballistics/scripts/initTargetWall.sqf
@@ -1,6 +1,8 @@
 // by commy2
 #include "script_component.hpp"
 
+private ["_wall", "_paper"];
+
 _wall = _this select 0;
 
 if (local _wall) then {