Commit Graph

11422 Commits

Author SHA1 Message Date
Daniel Lee
7bc28768da
Add Contact CBRN facewear overlays (#7826) 2020-08-04 09:27:51 -05:00
Jo David
e8210fb56b
reduce gps model vertex count from 3623 to 200 (#7827) 2020-08-04 09:26:29 -05:00
Mysteryjuju
02a242b6e7
Enable trenches on snow on Thirsk Winter map (#7830)
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
2020-08-04 09:21:29 -05:00
Vdauphin
d3727d7c27
Tagging - Add: Support of localized string for tagging interaction (#7819)
* Add support of localized string

* Add: Support of localized string for tagging interaction

https://github.com/acemod/ACE3/pull/7819#issuecomment-663993956

* Update addons/tagging/functions/fnc_applyCustomTag.sqf

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-07-27 09:08:37 -05:00
Brandon Danyluk
6b674f5395
Add config option for the use of pilot camera for weapons on that turret (#7812) 2020-07-22 10:37:56 -05:00
Whigital
a5fba9fe8e
RHS Compat - Add RHS:SAF compat (#7793)
* initial skeleton

* mrud mines

* more mines

* explosives

* compat checking

* ballistics

* handgun

* ak api
2020-07-22 10:36:57 -05:00
PabstMirror
46f3c55758
Medical Engine - Prevent issues with respawning and ragdoll animations (#7796) 2020-07-22 10:25:47 -05:00
PabstMirror
d751aca8ba
Tagging - Fix tag orientation on walls (#7795)
Fix #7769
2020-07-22 10:25:34 -05:00
JoramD
68fe594cab
Goggles - Add effects only option (#7808)
* Added effects only option to goggles

* Set default back to 2
2020-07-22 10:24:43 -05:00
Filip Maciejewski
731c1c27a6
Fix nametag names jump when no ranks shown and talking (#7807) 2020-07-11 22:16:01 -05:00
mjc4wilton
245d831d58
Logistics Wirecutter - Add additional Contact and Malden fences (#7800)
* Add additional fences

* Update AUTHORS.txt

Forgot to include myself in my first PR
2020-07-09 13:07:20 -05:00
shukari
ffbd72616a
Arsenal - double custom right panel misc items buttons fixed (#7801)
* added medical, food and roleplay categories to arsenal

* decreased wound stitch time

* added custom rightPanelButtons

* stuff that doesnt belong here

* fix

* commys wishes

* commys wishes part2

* Update addons/arsenal/defines.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* infinitely better SPEED

* changes

* delete unused stuff

* my own 3 white dots

* fixed fillRightPanel IDC_MISC

* commy fixes

* background first

* fix double buttons

Co-authored-by: Schwaggot <tom.ryan@posteo.de>
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2020-07-09 13:06:38 -05:00
Björn Dahlgren
fde8eb6642
Medical - Add missing model.cfg to unconscious animation rtms (#7788) 2020-07-01 19:03:32 +02:00
diwako
b16ca5c204
Medical - Add unconscious animations (#7363)
* Add custom anim entries

* Switch to SQF based animation detection

* Add time out to CBA_fnc_waitUntilAndExecute

* Remove unneeded comments or defines

* Restore line break

* Styling and removal of not needed code

* Move waitForAnime and make it local nil

* Extended comment

* Add Kola to authors file

* Small bug fix in terms of animation names

* Add custom anim entries


Switch to SQF based animation detection


Add time out to CBA_fnc_waitUntilAndExecute


Remove unneeded comments or defines


Restore line break


Styling and removal of not needed code


Move waitForAnime and make it local nil


Extended comment


Add Kola to authors file


Small bug fix in terms of animation names

* Move animations into data folder

* add uppercase on sqf command

* Rename animation config names and files

* fix physx uncon fix

* Change initial after ragdoll animation name
2020-07-01 15:08:54 +02:00
Smith
444ee88f08
Fix mistakes (#7786) 2020-06-30 17:34:15 -05:00
PabstMirror
231d52a73e Prep 3.13.3 Build 52 2020-06-29 12:34:45 -05:00
PabstMirror
68662e21c0 Merge branch 'master' into release-3.13.3 2020-06-29 12:34:07 -05:00
Elgin675
da552bb1fd
Translations - Update / Fix French Translations (gunbag and map_gestures modules) (#7775)
* Translation - Add / Fix french gunbag keys

* Translation - Add French Map_Gestures_onlyShowFriendlys keys
2020-06-29 10:44:02 -05:00
shukari
b77324ec58
Arsenal - add custom right panel misc items buttons (#7596)
* added medical, food and roleplay categories to arsenal

* decreased wound stitch time

* added custom rightPanelButtons

* stuff that doesnt belong here

* fix

* commys wishes

* commys wishes part2

* Update addons/arsenal/defines.hpp

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_fillRightPanel.sqf

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* infinitely better SPEED

* changes

* delete unused stuff

* my own 3 white dots

* fixed fillRightPanel IDC_MISC

* commy fixes

* background first

Co-authored-by: Schwaggot <tom.ryan@posteo.de>
Co-authored-by: Dedmen Miller <dedmen@users.noreply.github.com>
2020-06-29 10:43:33 -05:00
mharis001
d38dd1d67f
Add support for ED-1D and ED-1E drones (#7778) 2020-06-29 10:43:05 -05:00
Gold John King
4fedf5ecf5
Add: Simplified Chinese Translation for medical items and GUI (#7772)
* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Add: Simplified Chinese Translation for medical items and GUI

Add: Simplified Chinese Translation for medical items and GUI
Fix: Corrected some wrong Simplified Chinese Translation

* Update SC Translation for triage card

Update SC Translation for triage card
2020-06-23 09:12:06 -05:00
Hubert Stefanski
fe8d2e900b
Translations - fix Polish punctuation (#7776)
* fix punctuation

* minor change to lower-case
2020-06-23 09:11:22 -05:00
PabstMirror
c18ba87c60 Prep 3.13.3 Build 51 2020-06-22 14:04:03 -05:00
PabstMirror
cb2809f1b0 Merge branch 'master' into release-3.13.3 2020-06-22 14:03:47 -05:00
Smith
03fb4222d5
Added Russian translations to stringtables (#7770)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-22 13:51:52 -05:00
Hubert Stefanski
1fbcd2fb71
Add missing Polish translations (#7773) 2020-06-22 13:46:17 -05:00
PabstMirror
8ec20c5133 Prep 3.13.3 Build 50 2020-06-20 16:45:08 -05:00
teemo0803
05f56a6607
Update stringtable.xml (#7767) 2020-06-20 16:35:08 -05:00
mharis001
66f39eb5c2
Pylons - Fix disconnect handling (#7766) 2020-06-20 10:19:20 -05:00
Vdauphin
e9c1f5e18f
Medical - Improve injured sound by exiting the function earlier if no player is around (#7521)
* Exit earlier the playInjuredSound if no player is around

* Check if _targets array has at least one player

* Remove useless parenthesis

Co-Authored-By: commy2 <commy-2@gmx.de>

* Handle player inside a vehicle

If any player is inside the area then the _targets will not be empty. This also handle the case where player is inside a vehicle or _unit is a player.

* Handle z axis

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 19:42:23 -05:00
Dedmen Miller
c1b906c29d
Tagging - Add support for mission Tags (#7710)
* [Tagging] Added ability to specify custom model

* Update Tagging Framework doc

* [Tagging] Added parsing tags from missionConfig

* Update Tagging Framework doc

* Apply suggestions from code review

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Forgot passing a variable to WAE

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:36:47 -05:00
mharis001
553bba8ece
Common - Fix disableUserInput blocking already open Zeus display (#7757) 2020-06-19 10:36:24 -05:00
Joko
00fa94e636
Map Gestures - Rewrite and Add Zeus, and Spectator support (#7653)
* Initial Rewrite

* improve getProximityPlayers

* add Zeus Implementation

* fix missing simicolon

* add Spectator Support

* improve local responsiveness

* add Vanilla Spectator Support

* Fix Both Spectators are now working correctly

* exit mouse moving event early when disabled

* Move Diary Event registration to XEH DisplayLoaded

Port Settings to SQF
Add Setting for only showing Friendly Units pointing

* Fix Merge Issue in Stringtable

Redo Settings

* fix a copy past script error

* Update addons/map_gestures/functions/fnc_getProximityPlayers.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Lazy evals and defines

* Small changes

* Simplify initDisplayDiary and fix loading saves

* Cache getProximityPlayers

Improve Vanilla Spectator Support and how Followed unit Nearby data

* Minor header update

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:35:57 -05:00
mjc4wilton
7d4a2b07bb
Gunbag - Add weapon swapping (#7713)
* Gunbag Update

adds capability to swap a currently held primary weapon and the weapon current stored in the gunbag. Has a 1.5x time to complete compared to just adding or removing a weapon from the gunbag.

* Update stringtable.xml

* Update addons/gunbag/functions/fnc_swapWeapon.sqf

Update authors field to add credit to the original author of much of the changed code

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf

Update the virtual load in a more efficient way.

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update addons/gunbag/functions/fnc_swapWeaponCallback.sqf

Properly attribute author of majority of original code

Co-authored-by: Joko <hoffman.jonas95@gmail.com>

* Update stringtable.xml

* Update French translation

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Remove non-English translations

Leave translations open to translators

* Add CBA setting to enable weapon switching (Default false)

* Fixed variables and updated names for consistancy

* Convert from ACE Settings to CBA Settings

* Fix stringtable.xml indentation

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbag.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/functions/fnc_swapGunbagCallback.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Update addons/gunbag/initSettings.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update initSettings.sqf

Change default value to true

* Update CfgVehicles.hpp

Co-authored-by: Joko <hoffman.jonas95@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-19 10:35:19 -05:00
Smith
6525ae17b7
Translations - Update / Fix Russian (#7764)
* Translations - Update / Fix Russian

* Delete trailing char from Spanish translation
2020-06-18 10:41:23 -05:00
Elgin675
515d5aa97f
Translations - Update / Fix French Translations (#7763)
* Translation - Add French Dragging_CarryKeybind key

* Translation - Add / Fix French GForces keys

* Translation - Add French Medical_GUI_IGUI_PatientInfo key
2020-06-15 14:37:37 -05:00
Joko
eef7610f3e
downscale bodybagitem (#7755) 2020-06-15 13:56:47 -05:00
Rutger "RedBery" Meijering
7de6196c52
Fixes typo in medication adjustment check (#7759) 2020-06-15 09:53:25 -05:00
Rutger "RedBery" Meijering
7da977a4e3
Fixes some magazines not being found leading to duplication (#7760) 2020-06-15 09:52:14 -05:00
mharis001
3d6a558268
Fastroping - Fix FRIES removal (#7756) 2020-06-14 14:30:28 -05:00
Dystopian
09cc8173a1
Fix change seat while vehicle is moving (#7692) 2020-06-13 16:32:07 -05:00
PabstMirror
92941c11de
Aircraft - Restore missing laser designator on Commanche (#7752)
* Aircraft - Restore missing laser designator on Commanche

This now matches vanilla
Close #7712

* Update addons/aircraft/Heli_Attack_01_base_F.hpp

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/aircraft/Heli_Attack_01_base_F.hpp

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-06-13 16:03:28 -05:00
Laid3acK
d8a3eab499
Ballistics - Fix DMR_03 (SIG556) initSpeed (#7567)
* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix

* ballistics_fix
2020-06-13 15:58:42 -05:00
Serg Vergun
56b397ffa7
Fix medical_feedback override hearing settings (#7744) 2020-06-13 15:55:59 -05:00
Dystopian
2eedf7a4e7
Reload - Fix display ammo count in vehicle (#7730)
* Fix display ammo count in vehicle

* Revert CSW changes
2020-06-13 15:54:06 -05:00
Filip Maciejewski
79ca6f5141
Medical - Add Patient Info to Layout Editor (#7745)
* Move GVAR(RscPatientInfo) contents into ControlsGroup

* Add CfgUIGrids for Medical PatientInfo

* Move Medical PatientInfo to Layout Editor position

* Uniform macro names

* Apply suggestions from code review

* Add IGUI category translation

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Update addons/medical_gui/CfgUIGrids.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove redundant translations

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:53:50 -05:00
Daniel Gibson
185c15de0e
Medical - Add Global Wound Reopen Chance Modifer (#7747)
* Added Bandage Reopening Chance Modifier

* Added Wound Reopen Chance Addon Setting

* Fixed dumb error in localization setup

* Credit!

* Resolved issue with Addon Settings definition & removed testing values.

* PR Feedback #1

- Removed unnecessary whitespace on LN 46
- Call global var directly at LN 87
- Updated Wound Reopen Chance localized name & description

* PR Feedback #2

- Increased reopen coefficient upper limit from 2 to 5.

* Changed author credit to reflect GitHub email.
2020-06-13 15:52:30 -05:00
LachlanSneddon
c39992199a
Dragging - Add Keybind for Carry (#7746)
* add carry keybind

* Corrected canCarry Check

* Removed 'False' in key up parameter

* removed newline
2020-06-13 15:51:47 -05:00
Joko
3a13dd416a
Improve Performance from updateTrajectoryPFH in Winddeflection (#7700) 2020-06-13 15:45:27 -05:00
Joko
6a59bf2a6c
Advanced Ballistics - Improve Performance in handleFirePFH (#7699)
* Improve Performance from handleFirePFH in Advanced Ballistics

* PabstMirror Suggestion

* Dont remove and readd the PFH but have one persitently running

* Update addons/advanced_ballistics/XEH_postInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:45:09 -05:00
Filip Maciejewski
7c93ee9ed3
GForces - Add forces strength coefficient setting (#7750)
* Move GForce settings to CBA Settings

* Add GForce coefficient setting

* Fix typo

* Restore ACE Settings class and mark as moved to SQF

* Apply translation suggestions from code review

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-06-12 19:06:03 -05:00
Whigital
e7256dad3d
Explosives - Fix place explosives cache not being cleared on respawn (#7637) (#7739)
* respawn handler

* Revert "respawn handler"

This reverts commit abdf9599bf.

* unit switched eh

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-10 16:24:15 -05:00
PabstMirror
5de7b6b6a3
MicroDagr - Don't show markers on compass "map" control (#7751)
Close #7738
2020-06-08 23:05:57 +02:00
mharis001
99df791c43
Arsenal - Add grenade fuse time stat (#7694)
* Arsenal - Add grenade fuse time stat

* Add German translation

Co-authored-by: Jo David <github@jonathandavid.de>

* Add French translations

Co-authored-by: Elgin675 <elgin675@hotmail.com>

* Improve IR grenades handling

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Get ammo config once

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-07 19:58:55 -05:00
McDiod
e25b02263a
switchUnits - Fix switching units not working (#6188) (#7676) 2020-06-07 18:25:11 -05:00
mharis001
7746dbcc75
Spectator - Add display loaded and unloaded events (#7720) 2020-06-05 20:13:10 -05:00
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