PabstMirror
a621d2eb72
Medical Statemachine - Ensure bleedout condition string is code ( #7998 )
2020-11-10 10:06:45 -06:00
Elgin675
92cd367765
Translations - Add French "Medical_Statemachine_CardiacArrestBleedout" keys ( #7997 )
2020-11-08 17:46:13 -06:00
Dedmen Miller
1efa25fe2b
Explosives - Add clackerAdded event ( #7994 )
...
* Add clackerPlaced event
* Update docs/wiki/framework/events-framework.md
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 17:26:02 -06:00
BaerMitUmlaut
0c84cdd375
Fix unconscious medics not being healed by other AI medics ( #7995 )
2020-11-08 16:32:02 -06:00
BaerMitUmlaut
d27122fa16
Medical Status - Fix unconscious AI aiming at enemies ( #7977 )
...
* Fix unconscious AI aiming at enemies
* Improve handling when locality changes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 16:27:10 -06:00
Laid3acK
718d282263
Ballistics - Update the B 556x45 dual ( #7982 )
...
* B_556x45_dual
* B_556x45_dual
2020-11-08 16:26:30 -06:00
BaerMitUmlaut
0e642758d6
Medical Statemachine - Add setting to disallow bleedout in cardiac arrest ( #7547 )
...
* Add setting to disable bleedout in cardiac arrest
* Improve setting name and description
2020-11-08 16:24:44 -06:00
BaerMitUmlaut
119450f4e9
DAGR / Interaction Menu / Repair - Fix overwriting globals ( #7990 )
...
* Remove global DAGR_NEXT variable
* Remove global ERR variable
* Fix overwriting global this variable
* Fix overwriting global total and hitpoint variables
* fix condition
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-08 15:54:14 +01:00
Elgin675
5d1aa28419
Translations - Add French "Medical_Treatment_bodybagWhileStillAlive" key ( #7993 )
2020-11-07 17:08:01 -06:00
Elgin675
95d4dc811b
Translations - Update French Translations (Arsenal, Markers and Medical GUI) ( #7987 )
...
* Translation - Add french "Arsenal_sortByProtection" keys
* Translation - Add french "Markers_Timestamp" keys
* Translation - Add french "Medical_GUI_InteractionMenuShowTriage" keys
2020-11-07 09:36:12 -06:00
Elgin675
712a27788f
Translations - Update / Fix French Translations (Medical Treatment) ( #7988 )
...
* Translations - Fix French "TreatmentTime" keys.
* Translations - Add French "TreatmentTime" keys.
* Translations - Fix some french keys (medical_treatment).
* Translation - Add french "Treatment_WoundStitchTime" and "AllowBodyBagUnconscious "keys
* Translations - Fix french "Medical_Treatment_AllowSelfStitch_DisplayName" key
* Fix french "Medical_Treatment_MedicIV_Description" key
* Fix french "Medical_Treatment_AllowSelfIV_DisplayName" key
2020-11-07 09:35:40 -06:00
PabstMirror
bc7194942f
Update fnc_sortStatement_protection.sqf ( #7989 )
2020-11-05 18:42:41 +01:00
PabstMirror
12ad406fa3
Prep 3.13.5 Build 56
2020-11-02 23:01:40 -06:00
BaerMitUmlaut
af2973a9f0
Fix spare wheels receiving fall damage ( #7978 )
2020-11-02 21:43:49 -06:00
PabstMirror
ff2136c98f
Update fnc_fillSort.sqf ( #7981 )
2020-11-02 21:42:48 -06:00
Brett
9226035d59
Arsenal - Conditional on sorts ( #7889 )
...
* Arsenal - conditional on sorts
* fix: zero divisor
* update fnc_addSort
* Update fnc_fillSort.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-11-02 12:23:44 -06:00
BaerMitUmlaut
260706cb9f
Fix door opening for buildings with 10+ doors ( #7975 )
2020-11-02 12:22:53 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup ( #7973 )
2020-10-30 23:40:10 -05:00
PabstMirror
2ca13fc022
Medical - Cleanup preload debugging, bump to 2.00 ( #7976 )
2020-10-30 13:29:13 -05:00
mharis001
aab8d8eb32
Medical Treatment - Title case autoinjector item names ( #7974 )
2020-10-30 14:45:28 +01:00
PabstMirror
b991fe1343
Arsenal - Sort by protection (helm, uniform, vest) ( #7952 )
...
* Arsenal - Sort by protection (helm, uniform, vest)
* Update fnc_sortStatement_protection.sqf
* split to 2 different sorts
2020-10-29 11:38:31 -05:00
BaerMitUmlaut
b389740a29
Medical AI - Fix AI healing itself too fast when hit ( #7955 )
...
* Fix AI healing itself too fast when hit
* make time constants gvars
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:38:24 -05:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions ( #7951 )
...
* adjustable times for most constant treatment times
* add new line, formatting
* cleanup merge
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag ( #7941 )
...
* medical: allow placing unconscious in a bodybag
* Always show body bag action on non-awake units
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:36 -05:00
Drofseh
ef56a2dc32
Remove MAR-10 magazines from AWM magwell ( #7777 )
2020-10-29 11:37:15 -05:00
Freddo
afb3dad22b
Markers - Add timestamps ( #7947 )
...
* Add timestamps to markers
* Tiny tweaks
* Update addons/markers/functions/fnc_canTimestamp.sqf
Co-authored-by: Brett <brett@bmandesigns.com>
* Update addons/markers/functions/fnc_initInsertMarker.sqf
Co-authored-by: Brett <brett@bmandesigns.com>
* Add timestamp format setting
* Script cleanup, move checkbox under desc
* Fix stringtable validation
* Tweaks
* Remove styling from stringtable
* Edit timestamps instead of append
Credits to @PabstMirror
Co-authored-by: Brett <brett@bmandesigns.com>
2020-10-29 11:36:59 -05:00
Daniel Gibson
174223bddf
Medical - Add Treatment Time Addon Settings ( #7900 )
...
* Added Addon Settings for several Medical Treatment Times
Tourniquets, IV Bags, Syringes, Splints, and Body Bags.
* Fixed stringtable indentation
* And again
2020-10-29 11:07:30 -05:00
mjc4wilton
2220822d30
Gunbag - Add BI Arsenal Compatibility ( #7887 )
...
* Initial Commit
* Remove development components
* Adapt to ACE_player & resolve returned assignment
* Update addons/gunbag/functions/fnc_BIArsenalClose.sqf
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: commy2 <commy-2@gmx.de>
2020-10-29 10:12:51 -05:00
Brett
78c307196d
Medical - Show triage level in interaction ( #7940 )
...
* medical: show triage in interaction
* rename
* clean up comments
* Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/medical_gui/functions/fnc_modifyActionTriageLevel.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
* Add setting (disabled, enabled, medicsOnly)
* Apply suggestions from code review
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2020-10-28 19:08:00 -05:00
Brett
a67d6eecb0
Arsenal - Provide reference to the current box ( #7948 )
...
* arsenal: provide ref to current box
* use objNull instead of nil
* Update fnc_openBox.sqf
2020-10-26 12:01:18 -05:00
PabstMirror
0f6a9ecb87
Zeus - Don't allow creating a new zeus module if we already are one ( #7970 )
2020-10-25 14:01:59 -05:00
Walthzer
84b18d3f06
Slideshow - Add "SlideChanged" event ( #7954 )
...
* Implement Events in slideshow framework.
* Update function header
* Pass correct agruments to next call of autoTransiton.
* Add return of slideshow ID
Return slideshow ID so it can be stored for later use with the events.
* Replace repeat code with variable. _image.
* Redundant comment removal
* Update addons/slideshow/functions/fnc_createSlideshow.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2020-10-25 12:14:57 -05:00
Laid3acK
8e999ae0cf
Scopes - Weapons IronSightBaseAngle updated ( #7958 )
...
* spar_IronSightBaseAngle
* spar_IronSightBaseAngle
* spar_IronSightBaseAngle
2020-10-25 10:49:44 -05:00
Joko
153644b77a
Reload/Interaction - Fix 2 hemtt ingame errors ( #7924 )
...
* fix 2 hemtt ingame errors
* Extract broken calls to function
* Update addons/interaction/functions/fnc_doRemoteControl.sqf
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Dystopian <sddex@ya.ru>
2020-10-21 11:17:42 -05:00
Brett
25cc139dba
Vehicle Lock: add events ( #7938 )
...
* vehiclelock: events
* Update addons/vehiclelock/functions/fnc_lockpick.sqf
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
* Update addons/vehiclelock/functions/fnc_lockpick.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/vehiclelock/functions/fnc_lockpick.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-21 10:38:07 -05:00
BaerMitUmlaut
e07d2ae5d5
Make refuel nozzle unbreakable ( #7957 )
2020-10-21 10:37:14 -05:00
Filip Maciejewski
73e151ea5d
Include only highest res mipmaps in maptools overlay textures ( #7953 )
...
2048x2048 boys
2020-10-10 23:44:11 +02:00
BaerMitUmlaut
4cfe26b842
Disable damage for all cargo objects ( #7946 )
2020-10-10 18:58:38 +02:00
BaerMitUmlaut
56baf2bfd0
Fix engine fire position of Kamaz trucks ( #7945 )
2020-10-09 12:55:16 -05:00
Cyruz143
d19bdceda1
Grenades - Remove ref to missing audio ( #7928 )
...
* Remove ref to missing audio
* Removing unused dummy files
2020-10-09 12:54:41 -05:00
Elgin675
aa74178702
Translation - add/fix french keys in 'explosives' module ( #7942 )
2020-10-05 11:40:26 -05:00
Björn Dahlgren
8651d4c97d
Fastroping - Fix inconsistent usage of ARR macro ( #7936 )
2020-10-05 11:40:03 -05:00
Taha
e53bc23ebf
Turkish Language Update ( #7909 )
...
Added missing translation to Turkish
2020-10-04 10:57:46 -05:00
PabstMirror
5fa490aef3
Update CfgVehicles.hpp ( #7935 )
2020-10-03 20:21:48 -05:00
Neviothr
6278b67370
Frag - Add frag values to R_MRAAWS_HE_F ( #7927 )
...
* Add frag values to R_MRAAWS_HE_F
* damn tabs
* Use GVAR() macro
2020-10-03 18:32:21 -05:00
Freddo
e27110aac3
Explosives - Add CBA settings for max/min/default timer values ( #7916 )
...
* Transfer to CBA settings, add timer options
* Remove wiki note
* Tweak arrays, stringtables
* moveToSQF
2020-10-03 12:00:06 -05:00
Björn Dahlgren
8e7f9b6db5
Medical Treatment - Fix invalid usage of ARR macro ( #7933 )
2020-10-03 10:21:29 -05:00
Björn Dahlgren
c4e7092ebf
Hearing - Fix invalid usage of ARR macro ( #7932 )
2020-10-03 10:21:20 -05:00
Björn Dahlgren
2f3732003f
Fastroping - Fix invalid usage of ARR macro ( #7931 )
2020-10-03 10:21:10 -05:00
Björn Dahlgren
aa3d28e5be
Arsenal - Fix invalid usage of ARR macro ( #7930 )
2020-10-03 10:20:59 -05:00
Elgin675
f25e023fd6
Translations - Fix french translations (Fastroping) ( #7910 )
...
* Fix french fastroping translations
* Add nickname to 'authors.txt"
2020-10-03 10:20:46 -05:00
Brett
e2e31efd54
Arsenal - Remove launcher sorts ( #7890 )
2020-09-29 19:04:37 +02:00
Cyruz143
38baa8dc6c
Check if vehicle has simEnabled before mounting ( #7886 )
2020-09-03 10:56:49 -05:00
PabstMirror
434b0b9a11
Prep 3.13.4 Build 55
2020-08-30 21:57:20 -05:00
PabstMirror
530b24e893
Merge branch 'master' into release-3.13.4
2020-08-30 21:57:02 -05:00
Cyruz143
ee75268205
Adding splits + torniquets to simple crate ( #7885 )
2020-08-30 21:55:26 -05:00
PabstMirror
d63c8f37fe
Arsenal - Fix sortPanel script error ( #7883 )
2020-08-30 09:43:44 -05:00
PabstMirror
6963c4c80f
Prep 3.13.4 Build 54
2020-08-28 10:35:10 -05:00
PabstMirror
5a16aa1e8b
Merge branch 'master' into release-3.13.4
2020-08-28 10:34:20 -05:00
classic
49c84e2ce1
Update Japanese translation ( #7880 )
2020-08-28 10:30:32 -05:00
Joko
dd41f3e799
Map Gestures - reduce the size of the procedural texture and don't generate mipmaps ( #7876 )
...
* change procedural texture to static texture existing in a3 Assets
* use a smaller and no mimaps in the procedural texture
2020-08-27 10:51:49 -05:00
Elgin675
5ee3424d4b
Translations - Update / Fix French Translations (Grenades and Advanced Throwing) ( #7871 )
...
* Translation - add/fix french grenades keys
* Translation - fix french convertExplosives and Convert_Fuse keys
* Translations - fix some french keys in Advanced Throwing module
2020-08-27 10:45:39 -05:00
Brett
b51cf3575c
Arsenal - Fix sorting when using search ( #7877 )
...
* fix sorting when using search
* remove unused line
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-27 10:44:18 -05:00
Brett
241f1aefbd
fix face, voice, insignia in arsenal ( #7879 )
2020-08-27 10:37:20 -05:00
Brett
572e61d1cf
Arsenal - Fix fire rate sort caused by flashlight ( #7878 )
...
* fix firerate sort caused by flashlight
* Update fnc_sortStatement_rateOfFire.sqf
* Update addons/arsenal/functions/fnc_sortStatement_rateOfFire.sqf
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2020-08-27 10:35:55 -05:00
PabstMirror
b4f7963434
Prep 3.13.4 Build 53
2020-08-24 19:35:36 -05:00
PabstMirror
b4d89e919e
Misc - Fix UBCs ( #7870 )
2020-08-24 13:31:35 -05:00
Cyruz143
b21535665b
Grenades - Add throwable explosive charges ( #7860 )
...
* First pass on adding throwable explosives
* Moved fnc call to postinit
* Disabled gits auto CRLF bs
* Changing fnc name and call
* Move names to string table
* Using vanilla icon and removing explosive depend
* More stringtable conversions
* Missing semi-colons causing RPT error
* Update addons/grenades/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove empty strings
* Update addons/grenades/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Add compatibility with "realistic names" modules, and add french translation
* Fix little mistake
* Update addons/grenades/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Add setting
* Change setting name, use ace_settingsInitialized
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-24 12:45:56 -05:00
Elgin675
a919dd70b7
Translations - fix some french keys (ACE Uncategorized menu) ( #7866 )
2020-08-23 09:05:05 -05:00
Elgin675
61eea98976
Remove "ACE" prefix for Gunbag in Uncategorized menu ( #7867 )
2020-08-23 14:35:33 +02:00
mharis001
0f08a18f89
Medical - Add force walk option to fracture setting ( #7852 )
...
* Medical - Add force walk option to fracture setting
* Add French translation
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Reduce calls to statusEffect_set (#7865 )
* Reduce calls to statusEffect_set
* statusEffect_addType fracture to forcewalk
Co-authored-by: Elgin675 <elgin675@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-22 19:37:15 -05:00
Elgin675
dd2babb833
Translations - Update / Fix French Translations (Arsenal and Map Gestures) ( #7863 )
...
* Translation - Add french "Arsenal_sortBy" keys
* Translation - Add / Fix french Map_Gestures keys
2020-08-22 11:54:44 -05:00
Elgin675
9c0eebaa07
Map Gestures: Fix Briefing Mode setting strings ( #7862 )
2020-08-21 13:09:14 +02:00
Neviothr
5326d0acf5
ACE Arsenal - fix #6591 , PCML has no ammo ( #7850 )
...
As per @Superxpdude comment - https://github.com/acemod/ACE3/issues/6591#issuecomment-667706600
2020-08-18 12:49:53 -05:00
Laid3acK
2f9c4b6b41
Ballistics - Add a 5.8mm magazine with the CMR-76 (QBU-88) ( #7820 )
...
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
* 58x42_qbu_mag
2020-08-18 12:44:58 -05:00
Joko
bddf74cbb4
Map Gestures - Add Briefingscreen support, Different Camera Range, Improve Responsiveness, and Toggles for Curators and Spectators Maps ( #7782 )
...
* Add Variable Range for Camera Users (Zeus, Spectator) + Settings
Add Setting to Disable Zeus and/or Spectator Map Draws
Add Ability to use Map Gestures on Briefing screen
Add Setting for Briefing Screen mode (All, Only Group, Only Side, Proximity, Disabled)
* disable DISABLE_COMPILE_CACHE
* minor cleanup and add some translations
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-18 12:44:16 -05:00
Brett
d72555ab0c
Arsenal - Add Sorting Algorithms ( #7719 )
...
* support per tab sorting, and external algorithms
* improved sub sorting
* improve alphabetical search
* update mod sorting
* sort by accuracy
* sort right panel
* more sorts
* sort right tab
* fix empty
* stringtables
* Apply suggestions from code review
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
* more suggestions
* suggestions
* remember last sort
* Fix missing throw and put names
* bad copy paste in stringtable
* Update addons/arsenal/functions/fnc_sortPanel.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-18 12:43:35 -05:00
mharis001
4d769e4b8f
Cargo - Fix loaded cargo not being deleted when vehicle is destroyed ( #7851 )
2020-08-18 12:42:09 -05:00
mharis001
c8bb046d31
MicroDAGR - Fix contour interval info showing on compass ( #7849 )
2020-08-12 01:48:40 -04:00
Mysteryjuju
5c68f1dac3
Trenches - Add settings to configure dig/remove trenches durations ( #7831 )
...
* Trenches - Add settings to configure dig/remove trenches durations
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
* Trenches - Remove dirty tabs
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
* Trenches - Update French translation
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Update addons/trenches/stringtable.xml
Co-authored-by: Elgin675 <elgin675@hotmail.com>
* Trenches - Change SLIDER to TIME settings & update english translations
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
* Trenches - Change CBA settings function
Signed-off-by: Mysteryjuju <mysteryjuju42@gmail.com>
Co-authored-by: Elgin675 <elgin675@hotmail.com>
2020-08-09 10:12:54 -05:00
TyroneMF
1626d05201
Small Arms - Add stringtable ( #7823 )
...
* Convert Small Arms to Stringtable
- Convert Small Arms component to stringtable
- Added Vector 45 additional magazines still listed as 30 rounds.
* Newlines end of file
* Fix stringtable
* Remove unnecessary string entries
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-08-09 10:12:30 -05:00
Daniel Lee
c2715a2e41
Add hearing protection to LDF and Spetsnaz helmets ( #7843 )
2020-08-09 10:11:50 -05:00
Jo David
9ef4371c18
MicroDAGR - Improve item model ( #7838 )
...
* add nicer microdagr model
* rename files
(2 renames because of change in case (MicroDAGR -> microdagr)
* reduce gloss, reduce dirt on screen
* rotate model by 180° and use dummyweapon item model for better ground alignment when placing or dropping the microdagr
2020-08-06 11:51:29 -05:00
Daniel Lee
48c7738c57
Add G-force reduction to Heli Pilot Coveralls [LDF] ( #7825 )
2020-08-04 10:43:53 -05:00
Gold John King
b42d6f013d
Update: Minor changes on Simplified Chinese translation. ( #7829 )
...
* 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
* Update Chinesesimp Translations
Update: usage for doing something in SC.
Update: Bandaging action in SC.
* Update: Unlock action for SC Translation
Update: Unlock action for SC Translation
2020-08-04 10:15:03 -05:00
Björn Dahlgren
7446ca1655
View Distance - Update view distance on video options changes ( #7824 )
2020-08-04 10:02:01 -05:00
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
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
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
Elgin675
68ef196bcf
Translation fr: fix inaccurate 'ACE_Medical_Fractures_SplintHasEffects' key. ( #7633 )
2020-04-10 15:13:33 -05:00
mharis001
a7260c6974
Magazine Repack - Add inventory context menu action ( #7631 )
2020-04-09 03:52:54 +02:00
pterolatypus
79ea841eeb
Medical Damage - Determine ammo damage type through config property ( #7608 )
...
* Determine ammo damage type through config property
* Tabs
* Add warning when property is missing
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Fixed up inheritance
Some classes were not editable;
changes moved to relevant subclasses instead
* Newlines for readability
* More sensible default value
* Fix mistakes I added
* Update addons/medical_damage/CfgAmmo.hpp
* Pre-cache special values for damage types
* Support # values
For backwards compatibility
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-04-07 21:52:20 -05:00
Filip Maciejewski
64c30a94be
Map - Detect switchable flashlight attachments for map ( #7578 )
2020-04-07 17:48:32 +02:00
Laid3acK
cf3b0467ac
Ballistics - B_50BW_Ball_F updated ( #7572 )
...
* 50bw_noformat
* 50bw_noformat
* 50bw_noformat
* 50bw_noformat
* 50bw_noformat
2020-04-06 10:27:39 -05:00
TyroneMF
9c4aef3096
Realistic Names - Add 2D optics ( #7571 )
...
* Add 2D optics to realistic names.
* require ace_optics
2020-04-06 10:23:24 -05:00
pterolatypus
90338fd893
Fix typo in HandleDamage ( #7629 )
2020-04-06 16:05:57 +01:00
PabstMirror
a84af7ba9a
Medical - Improve some error msgs ( #7588 )
2020-04-05 05:01:51 +02:00
