diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp
index 41462354d8f..8aa5d3173ee 100644
--- a/addons/aircraft/CfgAmmo.hpp
+++ b/addons/aircraft/CfgAmmo.hpp
@@ -2,7 +2,7 @@
class CfgAmmo {
class BulletBase;
class B_20mm : BulletBase {
- hit = 80;
+ hit = 80;
indirectHit = 12;
indirectHitRange = 2; //2;
caliber = 1.4;
@@ -13,7 +13,7 @@ class CfgAmmo {
tracerEndTime = 3.5;
CraterEffects = "ExploAmmoCrater";
- explosionEffects = "ExploAmmoExplosion";
+ explosionEffects = "ExploAmmoExplosion";
model = "\A3\Weapons_f\Data\bullettracer\tracer_red";
};
class ACE_20mm_HE : B_20mm {};
@@ -23,7 +23,7 @@ class CfgAmmo {
indirectHitRange = 0.3; //2;
explosive = 0;
CraterEffects = "";
- explosionEffects = "";
+ explosionEffects = "";
};
// adjust minigun caliber and deflection to other ammo
diff --git a/addons/aircraft/Heli_Attack_01_base_F.hpp b/addons/aircraft/Heli_Attack_01_base_F.hpp
index 7276b3e4029..22f2da3833e 100644
--- a/addons/aircraft/Heli_Attack_01_base_F.hpp
+++ b/addons/aircraft/Heli_Attack_01_base_F.hpp
@@ -907,7 +907,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
thermalMode[] = {0,1};
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
- horizontallyStabilized = 1;
+ horizontallyStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_wide_F";
};
class Medium: Wide
@@ -918,7 +918,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
maxFov = 0.093;
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
- horizontallyStabilized = 1;
+ horizontallyStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_medium_F";
};
class Narrow: Wide
@@ -929,7 +929,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
maxFov = 0.029;
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
- horizontallyStabilized = 1;
+ horizontallyStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
};
@@ -941,7 +941,7 @@ class Heli_Attack_01_base_F: Helicopter_Base_F {
maxFov = 0.01;
gunnerOpticsColor[] = {0,0,0,1};
directionStabilized = 1;
- horizontallyStabilized = 1;
+ horizontallyStabilized = 1;
gunnerOpticsModel = "\A3\Weapons_F_Beta\Reticle\Heli_Attack_01_Optics_Gunner_narrow_F";
};
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 5683eaf0d3b..f609aabd938 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -95,7 +95,7 @@
Algema Plástica
Fascietta
Gyorskötöző
- Пластиковые наручники
+ Кабельная стяжка
Cable ties that allow you to restrain prisoners.
@@ -107,7 +107,7 @@
A algema plástica permite que você contenha prisioneiros.
Fascietta che ti consente di arrestare i prigionieri.
Gyorskötöző, emberek foglyulejtéséhez használható.
- Пластиковые наручники позволяют связывать пленников.
+ Кабельные стяжки позволяют связывать пленников.
Show player names
@@ -30,7 +31,7 @@
Zeige Spielernamen nur an, wenn die Maus auf sie gerrichtet ist (benötigt Spielernamen)
Noms uniquement sous le curseur (si noms affichés)
Zobrazit jméno hráče jenom na kurzor (vyžaduje jména hráčů)
- Mostra i nomi solo se puntati (richiede i nomi dei giocatori abilitati)
+ Mostra i nomi solo se puntati (richiede mostra nomi abilitato)
Mostrar nome de jogador somente no cursor (requer nome de jogadores)
Játékosok nevének mutatása csak a kurzoron (a nevek mutatása szükséges)
Показать имена игроков только под курсором (требует имен игроков)
@@ -44,6 +45,7 @@
Pokaż imiona graczy tylko po przytrzymaniu klawisza (wymagana opcja Pokaż imiona graczy)
Játékosnevek mutatása csak gombnyomásra (a nevek mutatása szükséges)
Показать имена игроков только по нажатию клавиши (требует имен игроков)
+ Mostra i nomi solo se si preme il tasto (richiede mostra nomi abilitato)
Show player ranks (requires player names)
@@ -52,7 +54,7 @@
Mostrar rango de los jugadores (requiere Mostrar nombres de jugadores)
Grade des joueurs (si noms affichés)
Zobrazit hodnosti hráčů (vyžaduje jména hráčů)
- Mostra i gradi (richiede i nomi dei giocatori abilitati)
+ Mostra i gradi (richiede mostra nomi abilitato)
Mostrar patente de jogadores (requer nome de jogadores)
Játékosok rendfokozatának mutatása (a nevek mutatása szükséges)
Показать звания игроков (требует имен игроков)
@@ -66,6 +68,7 @@
Zobrazit info o posádce vozidla
Показать экипаж
Jármű-legénység adatainak mutatása
+ Mostra le informazioni sull'equipaggio del veicolo
Show name tags for AI units
@@ -76,6 +79,7 @@
Wyświetl imiona jednostek AI
Afficher les noms des IA
Névcímkék mutatása MI-egységeknél
+ Mostra le tag nomi per le unità AI
Show SoundWaves (requires player names)
@@ -86,6 +90,7 @@
Pokaż fale dźwiękowe (wymagana opcja Pokaż imiona graczy)
Afficher "qui parle" (si noms affichés)
"Hanghullámok" mutatása (a nevek mutatása szükséges)
+ Mostra barra movimento audio (richiede mostra nomi abilitato)
Default Nametag Color (Non Group Members)
@@ -96,6 +101,7 @@
Couleur d'affichage par défaut (si dans aucun groupe)
Standardní barva jmenovek (pro nečleny jednotky)
Alap névcímke-szín (csoporton kívüli személyek)
+ Colore nametag di default (membri non del gruppo)
diff --git a/addons/optics/CfgWeapons.hpp b/addons/optics/CfgWeapons.hpp
index 7749db0bc41..6d61ff98a21 100644
--- a/addons/optics/CfgWeapons.hpp
+++ b/addons/optics/CfgWeapons.hpp
@@ -5,20 +5,20 @@ class CfgWeapons {
class Default;
class Binocular: Default {
- forceOptics = 0; // Allow using compass with Binocular
- opticsZoomMin = 0.056889; // 5.25x power
- opticsZoomMax = 0.056889; // 9 px/mil
- modelOptics = "\z\ace\addons\optics\models\NWD_M22_5x"; // 7 horizontal field of view
- visionMode[] = {"Normal"}; // Can't use nvgs with binoculars any more than you can with scopes
- // Fix AI using Binocs on short range - #18737
+ forceOptics = 0; // Allow using compass with Binocular
+ opticsZoomMin = 0.056889; // 5.25x power
+ opticsZoomMax = 0.056889; // 9 px/mil
+ modelOptics = "\z\ace\addons\optics\models\NWD_M22_5x"; // 7 horizontal field of view
+ visionMode[] = {"Normal"}; // Can't use nvgs with binoculars any more than you can with scopes
+ // Fix AI using Binocs on short range - #18737
// minRange = 300; // 300 = uses Rangefinder often (runs a few meters, stops, uses RF, repeats)
minRange = 500; //500 = seem almost never use it..?
- minRangeProbab = 0.001;
+ minRangeProbab = 0.001;
midRange = 1000;
midRangeProbab = 0.01;
maxRange = 5000;
maxRangeProbab = 0.01;
- };
+ };
// zooming reticle scopes
class optic_DMS: ItemCore {
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index c4ac2b1593d..f9bd537e3f9 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -22,6 +22,7 @@
Napraw animację
Corriger animation
Animációk kijavítása
+ Fixa l'animazione
diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf
index ead4b339433..19e6d413a2a 100644
--- a/addons/parachute/XEH_postInit.sqf
+++ b/addons/parachute/XEH_postInit.sqf
@@ -14,12 +14,13 @@
* Public: No
*/
#include "script_component.hpp"
+
if (!hasInterface) exitWith {};
["ACE3", QGVAR(showAltimeter), localize "STR_ACE_Parachute_showAltimeter",
{
// Conditions: canInteract
- if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false};
+ if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
if (!('ACE_Altimeter' in assignedItems ace_player)) exitWith {false};
if (!(missionNamespace getVariable [QGVAR(AltimeterActive), false])) then {
[ace_player] call FUNC(showAltimeter);
@@ -40,5 +41,4 @@ GVAR(PFH) = false;
}] call EFUNC(common,addEventHandler);
// don't show speed and height when in expert mode
-["Parachute", {if (!cadetMode) then {_dlg = _this select 0; {(_dlg displayCtrl _x) ctrlShow false} forEach [121, 122, 1004, 1005, 1006, 1014];};}] call EFUNC(common,addInfoDisplayEventHandler); //@todo addEventHandler infoDisplayChanged with select 1 == "Parachute"
-["Soldier", {if (!cadetMode) then {_dlg = _this select 0; {_ctrl = (_dlg displayCtrl _x); _ctrl ctrlSetPosition [0,0,0,0]; _ctrl ctrlCommit 0;} forEach [380, 382]};}] call EFUNC(common,addInfoDisplayEventHandler); //@todo addEventHandler infoDisplayChanged with select 1 == "Soldier"
+["infoDisplayChanged", {_this call FUNC(handleInfoDisplayChanged)}] call EFUNC(common,addEventHandler);
diff --git a/addons/parachute/XEH_preInit.sqf b/addons/parachute/XEH_preInit.sqf
index 91c24606c6c..f446d955b87 100644
--- a/addons/parachute/XEH_preInit.sqf
+++ b/addons/parachute/XEH_preInit.sqf
@@ -18,6 +18,7 @@
ADDON = false;
PREP(doLanding);
+PREP(handleInfoDisplayChanged);
PREP(hideAltimeter);
PREP(onEachFrame);
PREP(showAltimeter);
diff --git a/addons/parachute/functions/fnc_handleInfoDisplayChanged.sqf b/addons/parachute/functions/fnc_handleInfoDisplayChanged.sqf
new file mode 100644
index 00000000000..9b076256ddd
--- /dev/null
+++ b/addons/parachute/functions/fnc_handleInfoDisplayChanged.sqf
@@ -0,0 +1,41 @@
+/*
+ * Author: commy2
+ * Hides the height and velocity display while freefalling or parachuting on higher difficulties.
+ *
+ * Arguments:
+ * Stuff from infoDisplayChanged eventhandler.
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+private ["_dialog", "_type"];
+
+_dialog = _this select 0;
+_type = _this select 1;
+
+// don't do anything in noob mode
+if (cadetMode) exitWith {};
+
+switch (_type) do {
+ case ("Parachute"): {
+ {
+ (_dialog displayCtrl _x) ctrlShow false;
+ } forEach [121, 122, 1004, 1005, 1006, 1014];
+ };
+
+ case ("Soldier"): {
+ {
+ private "_control";
+ _control = (_dialog displayCtrl _x);
+
+ // these reset ctrlShow every frame by the engine. Set height/width to 0 as work around.
+ _control ctrlSetPosition [0,0,0,0];
+ _control ctrlCommit 0;
+ } forEach [380, 382];
+ };
+};
+nil // switch might return true if no case was found. Just to make sure the return value matches
diff --git a/addons/parachute/functions/fnc_showAltimeter.sqf b/addons/parachute/functions/fnc_showAltimeter.sqf
index a8200fb2ca6..45816cc883f 100644
--- a/addons/parachute/functions/fnc_showAltimeter.sqf
+++ b/addons/parachute/functions/fnc_showAltimeter.sqf
@@ -14,19 +14,24 @@
* Public: Yes
*/
#include "script_component.hpp"
+
private ["_unit"];
+
_unit = _this select 0;
-(["ACE_Altimeter"] call BIS_fnc_rscLayer) cutRsc ["ACE_Altimeter", "PLAIN",0,true];
+
+(["ACE_Altimeter"] call BIS_fnc_rscLayer) cutRsc ["ACE_Altimeter", "PLAIN", 0, true];
if (isNull (uiNamespace getVariable ["ACE_Altimeter", displayNull])) exitWith {};
GVAR(AltimeterActive) = true;
+
[{
- if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);};
+ if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler)};
disableSerialization;
EXPLODE_4_PVT(_this select 0,_display,_unit,_oldHeight,_prevTime);
- if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler);call FUNC(hideAltimeter);};
+ if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler); call FUNC(hideAltimeter)};
+
+ private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime", "_timeDiff"];
- private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime"];
_HeightText = _display displayCtrl 1100;
_DecendRate = _display displayCtrl 1000;
_TimeText = _display displayCtrl 1001;
@@ -35,7 +40,8 @@ GVAR(AltimeterActive) = true;
_height = (getPosASL _unit) select 2;
_curTime = time;
- _descentRate = floor ((_oldHeight - _height) / (_curTime - _prevTime));
+ _timeDiff = _curTime - _prevTime;
+ _descentRate = if(_timeDiff > 0) then {floor((_oldHeight - _height) / _timeDiff)} else {0};
_TimeText ctrlSetText (format ["%1:%2",[_hour, 2] call EFUNC(common,numberToDigitsString),[_minute, 2] call EFUNC(common,numberToDigitsString)]);
_HeightText ctrlSetText (format ["%1", floor(_height)]);
diff --git a/addons/parachute/stringtable.xml b/addons/parachute/stringtable.xml
index 52ccaefe772..a1de714331d 100644
--- a/addons/parachute/stringtable.xml
+++ b/addons/parachute/stringtable.xml
@@ -11,6 +11,7 @@
Altímetro
Magasságmérő
Высотомер
+ Altimetro
Altimeter Watch
@@ -21,6 +22,7 @@
Reloj altímetro
Magasságmérős karóra
Часы с высотомером
+ Controlla l'altimetro
Used to show height, descent rate and the time.
@@ -31,6 +33,7 @@
Utilizado para mostrar altura, tasa de descenso y hora.
Mutatja a magasságot, a zuhanási sebességet, és az időt.
Используется для определения высоты, скорости снижения и времени.
+ Usato per mostrare l'altitudine, la velocità di discesa e l'ora.
Non-Steerable Parachute
@@ -41,6 +44,7 @@
Neříditelný padák
Irányíthatatlan ejtőernyő
Неуправляемый парашют
+ Paracadute non manovrabile
-
\ No newline at end of file
+
diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml
index 7c401fec05c..51956670b7f 100644
--- a/addons/reload/stringtable.xml
+++ b/addons/reload/stringtable.xml
@@ -10,6 +10,7 @@
Sprawdź stan amunicji przy przeładowaniu broni
Vérification des munitions au rechargement
Lőszer ellenőrzése a fegyver újratöltésekor
+ Controlla le munizioni ricaricando
Check the ammo in your new magazine on magazine reload.
@@ -20,6 +21,7 @@
Pokaż stan amunicji w nowym magazynku przy przeładowaniu broni
Vérification du nombre de munition au rechargement
A lőszer ellenőrzése az új tárad behelyezésekor újratöltés közben.
+ Controlla le munizioni rimanenti nel caricatore in fase di cambio caricatore.
Check Ammo
@@ -54,6 +56,7 @@
Podłącz taśmę
Gurt anhängen
Töltényheveder összekötése
+ Attacca la tracolla
Linking belt...
@@ -64,6 +67,7 @@
Podłączanie taśmy...
Gurt anhängen ...
Töltényheveder összekötése folyamatban...
+ Attacco la tracolla...
diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml
index ff5637eaf61..77160503344 100644
--- a/addons/reloadlaunchers/stringtable.xml
+++ b/addons/reloadlaunchers/stringtable.xml
@@ -11,6 +11,7 @@
Załaduj wyrzutnię
Charger lanceur
Kilövö betöltése
+ Carica lanciamissili
Loading launcher ...
@@ -21,6 +22,7 @@
Nabíjím odpalovač ...
Ładowanie wyrzutni ...
Kilövő betöltés alatt ...
+ Carico il lanciamissili ...
Launcher loaded
@@ -31,6 +33,7 @@
Odpalovač nabit
Wyrzutnia załadowana
Kilövő betöltve
+ Lanciamissili caricato
Load %1
@@ -41,6 +44,7 @@
Nabít %1
Załadowano %1
%1 betöltése
+ Caricato %1
diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml
index 409a149f83f..65e21c01079 100644
--- a/addons/respawn/stringtable.xml
+++ b/addons/respawn/stringtable.xml
@@ -10,6 +10,7 @@
Rozmieszczenie za 5 sekund ...
Respawn za 5 sekund...
Kihelyezés 5 másodperc múlva ...
+ Dispiegamento in 5 secondi ...
Rallypoint deployed
@@ -20,6 +21,7 @@
Punkt zbiórki rozmieszczony
Rallypoint umístěn
Gyülekezőpont elhelyezve
+ Rallypoint dispiegato
Teleported to Base
@@ -30,6 +32,7 @@
Przeteleportowano do bazy
Odteleportován na základnu
Bázisra teleportálva
+ Teleportato alla base
Teleported to Rallypoint
@@ -40,36 +43,43 @@
Przeteleportowano do punktu zbiórki
Odteleportován na rallypoint
Gyülekezőpontra teleportálva
+ Teleportato al rallypoint
Rallypoint West (Base)
Sammelpunkt West (Basis)
Punto de reunión Oeste (Base)
+ Точка сбора Синих (База)
Rallypoint East (Base)
Sammelpunkt Ost (Basis)
Punto de reunión Este (Base)
+ Точка сбора Красных (База)
Rallypoint Independent (Base)
Sammelpunkt Widerstand (Basis)
Punto de reunión Independiente (Base)
+ Точка сбора Независимых (База
Rallypoint West
Sammelpunkt West
Punto de reunión Oeste
+ Точка сбора Синих
Rallypoint East
Sammelpunkt Ost
Punto de reunión Este
+ Точка сбора Красных
Rallypoint Independent
Sammelpunkt Widerstand
Punto de reunión Independiente
+ Точка сбора Независимых
\ No newline at end of file
diff --git a/addons/safemode/stringtable.xml b/addons/safemode/stringtable.xml
index 40691bd7da7..521651999ae 100644
--- a/addons/safemode/stringtable.xml
+++ b/addons/safemode/stringtable.xml
@@ -10,6 +10,7 @@
Biztonságos mód
Предохранитель
Sécurité
+ Sicura inserita
Take off Safety
@@ -20,6 +21,7 @@
Biztonsági kapcsoló eltolása
Снять с предохранителя
Enlever sécurité
+ Togli la sicura
Put on Safety
@@ -30,6 +32,7 @@
Biztonsági kapcsoló helyretolása
Поставить на предохранитель
Sécurité mise
+ Inserisci la sicura
Took off Safety
@@ -40,6 +43,7 @@
Biztonságos mód megszüntetve
Снят с предохранителя
Sécurité enlevée
+ Togli la sicura
diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml
index 4a06a779b51..dd5abdef552 100644
--- a/addons/scopes/stringtable.xml
+++ b/addons/scopes/stringtable.xml
@@ -6,54 +6,63 @@
Zerowanie powoli w górę
Малая корректировка ВВЕРХ
Ajuste menor arriba
+ Regola leggermente alzata in alto
Minor adjustment down
Zerowanie powoli w dół
Малая корректировка ВНИЗ
Ajuste menor abajo
+ Regola leggermente alzata in basso
Minor adjustment right
Zerowanie powoli w prawo
Малая корректировка ВПРАВО
Ajuste menor derecha
+ Regola leggermente il tiro a destra
Minor adjustment left
Zerowanie powoli w lewo
Малая корректировка ВЛЕВО
Ajuste menor izquierda
+ Regola leggermete il tiro a sinistra
Major adjustment up
Zerowanie w górę
Большая корректировка ВВЕРХ
Ajuste mayor arriba
+ Regola l'alzata in alto
Major adjustment down
Zerowanie w dół
Большая корректировка ВНИЗ
Ajuste mayor abajo
+ Regola l'alzata in basso
Major adjustment right
Zerowanie w prawo
Большая корректировка ВПРАВО
Ajuste mayor derecha
+ Regola il tiro a destra
Major adjustment left
Zerowanie w lewo
Большая корректировка ВЛЕВО
Ajuste mayor izquierda
+ Regola il tiro a sinistra
Set zero adjustment
Zresetuj wyzerowanie
Сбросить корректировку
Establecer ajuste a cero
+ Resetta i valori del tiro
diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml
index c95da37337c..58b0b46d6d8 100644
--- a/addons/switchunits/stringtable.xml
+++ b/addons/switchunits/stringtable.xml
@@ -10,6 +10,7 @@
Cambiado de unidad
Unité changée
Egység átváltva
+ Cambia unità
This unit is too close to the enemy.
@@ -20,6 +21,7 @@
Esta unidad está demasiado cerca del enemigo.
Cette unité est trop proche des ennemis
Ez az egység túl közel van az ellenséghez.
+ Questa unità è troppo vicina al nemico.
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index a327352f9b4..e62f9fdc5f8 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -10,6 +10,7 @@
Odemknout vozidlo
Jármű nyitása
Открыть машину
+ Apri il veicolo
Lock Vehicle
@@ -20,6 +21,7 @@
Zamknout vozidlo
Jármű zárása
Закрыть машину
+ Chiudi il veicolo
Lockpick Vehicle
@@ -30,6 +32,7 @@
Vypáčit vozidlo
Jármű feltörése
Взломать замок
+ Scassina veicolo
Picking Lock....
@@ -40,6 +43,7 @@
Páčim vozidlo...
Zár feltörése...
Взламываем замок...
+ Scassino il veicolo....
A custom key that will open a specific vehicle.
@@ -50,6 +54,7 @@
Vlastní klíč, který otevře konkrétní vozidlo.
Egy egyedi kulcs, ami egy meghatározott járművet nyit ki.
Ключ от конкретной машины.
+ Una chiave personalizzata che apre determinati veicoli.
A Master Key will open any lock, no matter what!
@@ -60,6 +65,7 @@
Hlavní klíč otevře libovolný zámek, bez vyjímek!
Egy főkulcs, ami minden zárat kinyit, helyzettől függetlenül!
Универсальный ключ, открывающий любой замок.
+ Una chiave principale che apre qualsiasi serratura!
A lockpick set that can pick the locks of most vehicles.
@@ -70,6 +76,7 @@
Sada paklíčů, která dokáže odemknout zámky u většiny vozidel.
Egy tolvajkulcs-készlet, mely a legtöbb jármű zárjait fel tudja törni.
Набор отмычек, которым можно взломать почти любую машину.
+ Un grimardello per forzare la maggior parte dei veicoli
A key that should open most WEST vehicles.
@@ -79,7 +86,8 @@
Klucz, który powinien otworzyć większość pojazdów ZACHODU.
Klíč který by měl otevřít většinou Západních vozidel.
Egy kulcs, ami a NYUGAT egységeinek legtöbb járművét ki tudja nyitni.
- Ключ для открытия большинства машин Запада.
+ Ключ для открытия большинства машин Красных.
+ Una chiave che apre la maggior parte dei veicoli WEST
A key that should open most EAST vehicle.
@@ -89,7 +97,8 @@
Klucz, który powinien otworzyć większość pojazdów WSCHODU.
Egy kulcs, ami a KELET egységeinek legtöbb járművét ki tudja nyitni.
Klíč který by měl otevřít vetšinu Východních vozidel.
- Ключ для открытия большинства машин Востока.
+ Ключ для открытия большинства машин Синих.
+ Una chaive che apr ela maggior parte dei veicoli EAST
A key that should open most INDEP vehicle.
@@ -100,6 +109,7 @@
Egy kulcs, ami a FÜGGETLEN egységek legtöbb járművét ki tudja nyitni.
Klíč který by měl otevřít většinu Nezávislých vozidel.
Ключ для открытия большинства машин Независимых.
+ Una chaive che apr ela maggior parte dei veicoli INDEP
A key that should open most CIV vehicle.
@@ -110,6 +120,7 @@
Klíč který by měl otevřít většinu Civilních vozidel.
Egy kulcs, ami a CIVIL járművek többségét ki tudja nyitni.
Ключ для открытия большинства машин Гражданских.
+ Una chaive che apr ela maggior parte dei veicoli CIV
diff --git a/addons/weaponselect/stringtable.xml b/addons/weaponselect/stringtable.xml
index d534ecd29b4..08bb510f6c8 100644
--- a/addons/weaponselect/stringtable.xml
+++ b/addons/weaponselect/stringtable.xml
@@ -10,6 +10,7 @@
Wyświetl tekst przy rzucie granatem
Afficher texte lors d'un lancé de grenade
Szöveg mutatása gránát eldobásakor
+ Mostra indicazioni nel lancio granate
Display a hint or text on grenade throw.
@@ -20,6 +21,7 @@
Wyświetla powiadomienie lub tekst przy rzucie granatem.
Afficher texte/info au lancé de grenade
Jelez egy súgót vagy szöveget a gránát eldobásakor.
+ Mostra un suggerimento quando si lanciano granate
Select Pistol
@@ -55,7 +57,7 @@
Sélectionner Lanceur
Rakétavető Kiválasztása
Selecionar Lançador
- Seleziona il Lanciatore
+ Seleziona il Lanciamissili
Select Grenade Launcher
@@ -162,6 +164,7 @@
Gránát: %1
Граната %1
Grenade %1
+ Granata %1
Ready Grenade
@@ -172,6 +175,7 @@
Gránát előkészítése
Подготовить гранату
Grenade prête
+ Granata pronta
Select Frag Grenade
@@ -194,7 +198,7 @@
Nem-robbanó Gránát Kiválasztása
Zvolit Ne-Výbušný Granát
Selecionar Granada
- Seleziona Altre Granate
+ Seleziona granate non a frammentazione
Выбрать гранату
@@ -218,6 +222,7 @@
Žádné granáty
Nincs több gránát
Гранат не осталось
+ Granate esaurite
No frags left
@@ -229,7 +234,7 @@
Už nejsou granáty
Não há granadas de fragmentação restantes
Nessuna granata a frammentazione rimanente
- Осколочныких гранат нет
+ Осколочных гранат нет
No misc. grenades left
@@ -264,6 +269,7 @@
Wystrzel granat dymny
Füstvető eltüzelése
Запустить дымовую завесу
+ Lancia fumogeno
-
+
\ No newline at end of file
diff --git a/addons/weather/XEH_postInit.sqf b/addons/weather/XEH_postInit.sqf
index 75e1277fee3..9276e710da4 100644
--- a/addons/weather/XEH_postInit.sqf
+++ b/addons/weather/XEH_postInit.sqf
@@ -39,6 +39,7 @@ _fnc_updateWind = {
// Update Rain
_fnc_updateRain = {
+ private ["_oldStrength","_rainStrength","_transitionTime","_periodPosition","_periodPercent"];
if(GVAR(enableRain)) then {
if(!isNil "ACE_RAIN_PARAMS" && {!isNil QGVAR(rain_period_start_time)}) then {
_oldStrength = ACE_RAIN_PARAMS select 0;
@@ -56,6 +57,7 @@ _fnc_updateRain = {
// Update Temperature
_fnc_updateTemperature = {
+ private ["_time","_month","_hourlyCoef","_avgTemperature","_pS1","_pS2"];
_time = daytime;
_month = date select 1;
diff --git a/addons/weather/functions/fnc_displayWindInfo.sqf b/addons/weather/functions/fnc_displayWindInfo.sqf
index 61d556a27c3..d84cddd1065 100644
--- a/addons/weather/functions/fnc_displayWindInfo.sqf
+++ b/addons/weather/functions/fnc_displayWindInfo.sqf
@@ -1,6 +1,5 @@
/*
* Author: Ruthberg
- *
* Displays a wind info (colored arrow) in the top left corner of the screen
*
* Argument:
@@ -29,13 +28,13 @@ GVAR(WindInfo) = true;
[{
private ["_windSpeed", "_windDir", "_playerDir", "_windIndex", "_windColor", "_newWindSpeed", "_windSource", "_height"];
-
+
if !(GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player) exitWith {
GVAR(WindInfo) = false;
0 cutText ["", "PLAIN"];
[_this select 1] call cba_fnc_removePerFrameHandler;
};
-
+
_windIndex = 12;
_windColor = [1, 1, 1, 1];
@@ -46,7 +45,7 @@ GVAR(WindInfo) = true;
} else {
vectorMagnitude ACE_wind;
};
-
+
if (_windSpeed > 0.2) then {
_playerDir = getDir ACE_player;
_windDir = (ACE_wind select 0) atan2 (ACE_wind select 1);
diff --git a/addons/weather/functions/fnc_getMapData.sqf b/addons/weather/functions/fnc_getMapData.sqf
index 86a05fb2252..fecf9f34f77 100644
--- a/addons/weather/functions/fnc_getMapData.sqf
+++ b/addons/weather/functions/fnc_getMapData.sqf
@@ -1,6 +1,5 @@
/*
* Author: Ruthberg, esteldunedain
- *
* Get the weather data for the current map
*
* Argument:
diff --git a/addons/weather/functions/fnc_getWind.sqf b/addons/weather/functions/fnc_getWind.sqf
index e25d53309d0..b0fbf5e8fa6 100644
--- a/addons/weather/functions/fnc_getWind.sqf
+++ b/addons/weather/functions/fnc_getWind.sqf
@@ -1,4 +1,15 @@
+/*
+ * Author: ACE2 Team
+ * Calculate current wind locally from the data broadcasted by the server
+ *
+ * Argument:
+ * None
+ *
+ * Return value:
+ * Wind
+ */
#include "script_component.hpp"
+private ["_dir","_dirInc","_dirRange","_period","_periodPercent","_periodPosition","_return","_spd","_spdInc","_spdRange"];
_return = [0,0,0];
if(!isNil "ACE_WIND_PARAMS") then {
diff --git a/addons/weather/functions/fnc_serverController.sqf b/addons/weather/functions/fnc_serverController.sqf
index 7646475e81d..e29836fc184 100644
--- a/addons/weather/functions/fnc_serverController.sqf
+++ b/addons/weather/functions/fnc_serverController.sqf
@@ -1,4 +1,15 @@
+/*
+ * Author: ACE2 Team, esteldunedain
+ * Calculate the wind and rain evolution on the server. Broadcast the current and next values to the clients
+ *
+ * Argument:
+ * None
+ *
+ * Return value:
+ * None
+ */
#include "script_component.hpp"
+private ["_gustCount","_gustDir","_gustSpeed","_gustTime","_gusts","_i","_lastRain","_maxInterval","_rainOverCast","_startDir","_startSpeed","_time","_timeTillGust","_transitionTime"];
// Rain simulation
if(GVAR(rain_period_count) > GVAR(rain_next_period)) then {
diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml
index 060d9b6f51c..2278bf350d1 100644
--- a/addons/weather/stringtable.xml
+++ b/addons/weather/stringtable.xml
@@ -7,6 +7,7 @@
Показать информацию о погоде
Afficher information du vent
Mostrar información del viento
+ Mostra informazioni sul vento
diff --git a/addons/winddeflection/stringtable.xml b/addons/winddeflection/stringtable.xml
index 897a3c556bc..8e2e00d96e1 100644
--- a/addons/winddeflection/stringtable.xml
+++ b/addons/winddeflection/stringtable.xml
@@ -11,6 +11,7 @@
Vent
Windinformationen
Szélinformáció
+ Informazioni sul vento
Direction: %1
@@ -21,6 +22,7 @@
Direction %1
Windrichtung: %1
Irány: %1
+ Direzione: %1
Speed: %1 m/s
@@ -31,6 +33,7 @@
Vitesse %1 m/s
Geschwindigkeit: %1m/s
Sebesség: %1 m/s
+ Velocità: %1 m/s
Weather Information
@@ -41,6 +44,7 @@
Météo
Wetterinformationen
Időjárás-Információ
+ Meteo
Humidity: %1%
@@ -51,6 +55,7 @@
Humidité: %1%
Luftfeuchtigkeit: %1
Páratartalom: %1%
+ Umidità: %1%
diff --git a/documentation/development/coding-guidelines.md b/documentation/development/coding-guidelines.md
index f72263eeaab..e39581a9d45 100644
--- a/documentation/development/coding-guidelines.md
+++ b/documentation/development/coding-guidelines.md
@@ -35,8 +35,8 @@ Tabs can be tricky sometimes, especially when it comes to sharing code with othe
## Braces
-- opening bracket on the same line as keyword
-- closing bracket in own line, same level of indentation as keyword
+- opening brace on the same line as keyword
+- closing brace in own line, same level of indentation as keyword
**Yes:**
@@ -70,7 +70,7 @@ class Something : Or {
};
```
-When using `if`/`else`, it is encouraged to put `else` on the same line as the closing bracket to save space:
+When using `if`/`else`, it is encouraged to put `else` on the same line as the closing brace to save space:
```c++
if (alive player) then {
@@ -90,7 +90,7 @@ class Three {foo = 3;};
#### Reasoning
-Putting the opening bracket in it's own line wastes a lot of space, and keeping the closing bracket on the same level as the keyword makes it easier to recognize what exactly the bracket closes.
+Putting the opening brace in it's own line wastes a lot of space, and keeping the closing brace on the same level as the keyword makes it easier to recognize what exactly the brace closes.
## How to create a new module
diff --git a/documentation/development/extension-guidelines.md b/documentation/development/extension-guidelines.md
index 0558d49d5e8..b5e7e985862 100644
--- a/documentation/development/extension-guidelines.md
+++ b/documentation/development/extension-guidelines.md
@@ -11,7 +11,7 @@ order: 9
### Requirements
- A compiler (VS/GCC/Clang)
- - If starting with visual studio, you need to make sure to use the Visual studio command prompt
+ - If starting with Visual Studio, you need to make sure to use the Visual studio command prompt
- cmake 3.0 or later in your path
### Cross-Platform Guidelines
diff --git a/documentation/development/modularity-and-pbo-structure.md b/documentation/development/modularity-and-pbo-structure.md
index ad1194e39cd..0c16c4bc972 100644
--- a/documentation/development/modularity-and-pbo-structure.md
+++ b/documentation/development/modularity-and-pbo-structure.md
@@ -10,23 +10,23 @@ order: 4
Main principles:
- As much stuff as possible should be modular
-- Strive to make as much stuff as possible run-time toogable. Adding/removing PBOS would still be requiring to toogle any feature relying on config changes.
+- Strive to make as much stuff as possible run-time togglable. Adding/removing PBOS would still be requiring to toggle any feature relying on config changes.
### PBO Structure
Main principles:
- Try to keep single module dependencies as much as possible
-- InteractionMenu would be the requirement for most modules.
-- Anything that is 100% config should require common and not interaction.
+- Interact_Menu would be the requirement for most modules.
+- Anything that is 100% config should require Common and not Interact_Menu.
```
-Main -> Common -> OptionsMenu -> InteractionMenu -> Most things
+Main -> Common -> OptionsMenu -> Interact_Menu -> Most things
Main -> Common -> Config things
-Main -> Common -> 3D Models |
- InteractionMenu | -> Feature
+Main -> Common -> 3D Models |
+ Interact_Menu | -> Feature
```