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
13,837 Commits 73 Branches 88 Tags 752 MiB
1b94b25ff6
Commit Graph

11316 Commits

Author SHA1 Message Date
PabstMirror
1b94b25ff6
Trenches - Fix mission placed trench interactions (#7672) 
Assume progress is 1 if undefined
define placeData if undefined
 2020-06-05 18:35:32 +02:00
Smith
7a8a17b924
Add Russian translation (#7742) 
* Russian translation

* Update AUTHORS.txt

* CSW Fix Russian translation

* Fix RU translation mistakes

* Small fixes RU translation
 2020-05-31 16:04:21 -05:00
Filip Maciejewski
6fb8991bd6
Medical - Prevent packing into bodybag for bodies in vehicle (#7731) 
* Prevent packing into bodybag for bodies in vehicle

* Fix comment
 2020-05-28 23:07:26 -05:00
Abogado
19523f028a
Crew served weapons - Add spanish translations (#7728) 
* Update stringtable.xml

-Added spanish translations
-Minor corrections
-"Armas de manejo colectivo" could be more appropriate.
https://www.linguee.co/ingles-espanol/traduccion/crew-served+weapons.html
https://www.defensa.com/en-abierto/armamento-ligero-colectivo-pesado-infanteria-marina-espanola-20

* Update addons/csw/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:36:58 +02:00
Abogado
a06e230f7f
Translations - Spanish Cookoff (#7725) 
* Update stringtable.xml

Added translations to cook-off

* Update addons/cookoff/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:36:19 +02:00
Abogado
6a814ac468
Translations - Improve Artillery Tables (#7723) 
* Update stringtable.xml

Little correction to the traslation, so now it has more sense.

* Update addons/artillerytables/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:35:02 +02:00
Abogado
7c6de719be
Translations - Spanish (#7722) 
* Update stringtable.xml

Added spanish translation to most strings.

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

* Update addons/arsenal/stringtable.xml

Co-authored-by: Ferran Obon <ferran@idi-systems.com>

Co-authored-by: Ferran Obon <ferran@idi-systems.com>
 2020-05-24 06:33:10 +02:00
Abogado
eae28f35d3
Update stringtable.xml (#7729) 
-Minor corrections
 2020-05-23 10:59:40 +02:00
Abogado
b754956b61
Update stringtable.xml (#7724) 
Added some shotgun shells translations.
 2020-05-22 18:30:16 +02:00
Taha
35e4c2ae35
Turkish Language Update (#7690) 
* Fatal

Turkish Language Update

* Update AUTHORS.txt

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Update stringtable.xml

Problems solved

* Fix medical_treatment

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-05-09 12:26:27 -05:00
Elgin675
9286d9727e
Translations - Add French CSW StaticM2ShieldBag key (#7696) 2020-05-09 12:21:31 -05:00
Jo David
29ccd9c362
MG3 is not by Heckler&Koch (#7697) 2020-05-08 17:11:39 +02:00
Jo David
3c9a5d71ea
Fix german abbr of Ozelot Wiesel (#7698) 2020-05-08 16:55:38 +02:00
Neviothr
f718fd20f0
Nightvision - Increase max amount of IR rays to 64 (#7669) 
* increase max amount of IR rays to 64

* comment
 2020-05-07 11:34:41 -05:00
Michael Warr
ab3af34be4
Advanced Fatigue consumes SwayFactor setting again (#7680) 2020-05-07 11:31:46 -05:00
PabstMirror
7311e644a2
FCS - Fix not working in MP (#7675) 
also fix TRACE_10 macro
 2020-05-07 11:28:32 -05:00
regiregi22
64de0388c7
Translations - Spanish (#7687) 
* Update stringtable.xml

* restore english str

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-05-06 17:39:01 -05:00
regiregi22
66a6fa444e
Update stringtable.xml (#7689) 2020-05-06 17:38:24 -05:00
regiregi22
d17f4cc2ed
Update stringtable.xml (#7688) 2020-05-06 17:37:33 -05:00
regiregi22
7b652dd502
Update stringtable.xml (#7686) 2020-05-06 17:34:58 -05:00
regiregi22
167200b799
Update stringtable.xml (#7685) 2020-05-06 17:34:21 -05:00
Dominik Butschek
7a7485e016
Translations - Add missing Czech translation strings (#7683) 
* add missing Czech translation strings

* improve ClearTraumaAfterBandage translation
 2020-05-06 17:33:44 -05:00
Konrad Szumiec
e2157ac4c2
Hearing - Fix for "MrapAttenuation" (#7664) 
* Hearing: MRAP Attenuation Fix

Hearing: MRAP Attenuation Fix

* Update addons/hearing/functions/fnc_updatePlayerVehAttenuation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-04-30 20:01:34 -05:00
PabstMirror
58bc4b7ed8
CSW - Add configs for 1.98's M2 Turret (#7619) 2020-04-30 11:40:57 -05:00
PabstMirror
a84f59091e
Map - Only add BFT PFEH if enabled and fix missing markers (#7674) 2020-04-30 11:40:18 -05:00
Filip Maciejewski
25e212cfa3
Interaction - Show current team color in Team Management menu (#7650) 
* Show current team in interaction menu

* Use nametags color for Team Management icon color

* Use nametags color in Join team action icons colors

* Update addons/interaction/functions/fnc_modifyTeamManagementAction.sqf

Co-Authored-By: jonpas <jonpas33@gmail.com>

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>
 2020-04-30 11:39:03 -05:00
Elgin675
ff252a5bf9
Translations - fix some french keys (blood status and trenches) (#7670) 
* Translations: fix some french "blood lost" status

* Translations: fix some french "trenches" keys
 2020-04-30 11:37:56 -05:00
classic
7cc168e1b9
Updated japanese translation (#7668) 2020-04-27 11:24:34 -05:00
billw2012
8f1dc1d252
New group side in Leave Group interaction is same as original group side (#7667) 
Previously it would be `side player`, now it is `side group player`, which is more consistent (as unit and group sides are not necessarily the same).
 2020-04-27 06:22:48 +02:00
PabstMirror
a9a69ac4ff
Headers - Fix function names in examples (#7663) 2020-04-25 08:41:45 +02:00
commy2
1d407b314b
fix Unknown name (#7662) 2020-04-24 23:59:47 +02:00
PabstMirror
1e2b88f170
Minor RPT cleanup (#7658) 2020-04-22 10:05:22 -05:00
PabstMirror
a17f108ea8 Prep 3.13.2 Build 49 2020-04-21 11:01:45 -05:00
PabstMirror
b682e8fb6a Merge branch 'master' into release-3.13.2 2020-04-21 11:01:08 -05:00
Elgin675
123ac52404
Translations - Add French Dragging_RaiseLowerRotate key (#7656) 2020-04-21 09:48:53 -05:00
PabstMirror
c824163fff Prep 3.13.2 - Build 48 2020-04-20 10:51:17 -05:00
PabstMirror
d898b7de81 Merge branch 'master' into release-3.13.2 2020-04-20 10:50:45 -05:00
Jo David
3b15014099
Dragging - Add possiblity to rotate a carried object (#7640) 
* Add possiblity to rotate a carried object

* simplify the code by using cba_events_control instead of a custom set variable

* le ACE and don't save frames
 2020-04-20 17:45:59 +02:00
PabstMirror
21c927195a
Cargo - Re-enable damage on unloaded tanks (#7655) 2020-04-20 17:45:27 +02:00
Elgin675
c4667c896f
French translation: Medical_Damage_Eden_threshold keys (#7652) 
STR_ACE_Medical_Damage_Eden_threshold_DisplayName
STR_ACE_Medical_Damage_Eden_threshold_Description
 2020-04-19 21:29:01 -05:00
Filip Maciejewski
eb8856e7c5
Vehicles - Configurable speed limiter step (#7601) 
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-Authored-By: Elgin675 <elgin675@hotmail.com>
 2020-04-20 02:17:42 +02:00
diwako
142fc1e3de
Medical - Add ability for unit specific damage threshold (#7455) 2020-04-20 02:17:13 +02:00
Blutze
217ccce465
Grenades - use correct type for cookoff_enabled, check for AI and variable on vehicle (#7634) 
* check for variable and ai, use correct type

* clean up negations

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-04-19 11:30:02 -05:00
PabstMirror
36cbdb301e Prep 3.13.2 Build 47 2020-04-18 19:25:17 -05:00
Joko
ab989d4c34
Map Gestures - Improve transmit process (#7646) 
* simplify map gestures transmit process

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/map_gestures/functions/fnc_transmit.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* remove setPlayerOwner call

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-04-18 19:15:12 -05:00
shukari
4302a944d7
ace_cargoLoaded for zeus module (#7520) 2020-04-18 16:14:54 -05:00
Vdauphin
82d7980ada
CSW - Add event when deploy weapon succeded (#7635) 2020-04-14 09:34:34 -05:00
PabstMirror
fafc597321
CSW - Update 3den config for 1.98 changes (#7335) 2020-04-14 09:33:25 -05:00
Rutger "RedBery" Meijering
b3f7de9f0f
Cargo - Fix tankx vehicles receiving water damage when loaded (#7636) 
* Adds tankX simulation type to check for water damage fix

* Changes simulationType to variable

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/cargo/functions/fnc_loadItem.sqf

Co-Authored-By: Dystopian <sddex@ya.ru>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: Dystopian <sddex@ya.ru>
 2020-04-14 06:57:11 +02:00
PabstMirror
c4514b3fb3
Reload - Fix check ammo display for empty GL launchers (#7624) 
* Reload - Fix check ammo display for empty GL launchers

* Improve display for secondary muzzle
 2020-04-10 15:13:55 -05:00