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
14,069 Commits 73 Branches 88 Tags 752 MiB
75f7ed7532
Commit Graph

11495 Commits

Author SHA1 Message Date
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
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
jonpas
dd0ca9dc84
Respawn - Add save gear event (#7607) 2020-04-04 10:24:59 -05:00
Saborknight
68143cba41
Explosives - Remove "Activate mine" action menu item (#7622) 
* Fixed - "Activate mine" action menu item still showing

The "Activate mine" action menu item was still showing, but only after an explosive was set, then diffused.

* Update addons/explosives/config.cpp

Co-authored-by: commy2 <commy-2@gmx.de>
 2020-04-04 14:58:10 +02:00
BaerMitUmlaut
54086bb2ef
Fix being stuck dragging when in combat pace (#7617) 2020-04-03 18:28:14 -05:00
Rutger "RedBery" Meijering
1f20047410
Rearm - Fix vehicles failing rearm due to case differences (#7609) 2020-03-20 17:54:30 +01:00
TWC-Rik
be3d69ff25
Reload Launchers - Improve External Launcher Reload (#7605) 
Launchers reloaded by an external player will be instantly loaded since
the external player already has to go through a loading bar.
 2020-03-15 21:41:55 +01:00
PabstMirror
82116bd98b
CSW - Check carry mag exists (#7587) 
Fix #7579
 2020-03-11 18:42:21 -05:00
PabstMirror
e89c172d34
Arsenal - Fix main menu mission (#7594) 
* Arsenal - Fix main menu mission

* fix double space

* Add note
 2020-03-11 21:09:36 +01:00
Laid3acK
3db9a24007
Ballistics - 300WM Berger Hybrid OTM airFriction updated (#7570) 
* ballistics_300WM

* ballistics_300WM

* ballistics_300WM

* ballistics_300WM
 2020-03-09 11:43:11 -05:00
classic
85f67ac883
Update Japanese translation (#7568) 2020-03-09 11:26:20 -05:00
jonpas
4607f39249 Prepare release 3.13.1 2020-02-29 23:15:33 +01:00
jonpas
c42a004ab3
General - Fix preprocessor issues (#7563) 
* Fix preprocessor issues

* Fix more preprocessor issues
 2020-02-29 16:09:31 -06:00
commy2
15b4b98e5b
Medical Status - Fix double execution of killed event (#7561) 
* fix double execution of killed event

* revert the execNextFrame change

* make second execution run with null

* make second execution run with null
 2020-02-29 16:09:00 -06:00
commy2
9b86446b26
fix some magwells (#7562) 2020-02-28 18:33:11 +01:00
pterolatypus
c949a07c83
Medical Engine - Apply damage to the correct hitpoint (#7415) 
* HandleDamage uses armour values to determine which hitpoint was damaged

* Tidied up comments

* Newlines

* Tabs? In MY code?!

* Added uniform caching and option to force disable caching

* Review suggestions

* Review suggestions/code style

* Spelling and select

* Removed unnecessary validity check

* Apply suggestions from code review

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

* Tweaks and optimisations, removed _noCache

Also fixed cache nil vs empty

* Different approach with fewer loops
Lookup is now done per-hitpoint and default values cached
fnc_getItemArmor made a helper function as it's now only a few lines

* Tabs & newlines

* Moved uniform logic inside helper function

* Optimisations

* Tweaks & optimisations, improved formatting

* Ignore explosionShielding

* Moved getArmor back to separate func, add per-unit caching

* Formatting

* Review suggestions

Co-authored-by: commy2 <commy-2@gmx.de>
 2020-02-28 17:54:53 +01:00
Laid3acK
1d9361c503
fix_brace 2020-02-28 11:08:40 +01:00
Laid3acK
4a6d32774e
space_atragmx_initgunlist 2020-02-28 10:13:59 +01:00
Laid3acK
09332d333f
polish_atragmx_initgunlist 2020-02-28 10:11:07 +01:00
Laid3acK
3a3e0c53a0
dispersion_removed 2020-02-28 10:09:06 +01:00
Laid3acK
02b7b6d2c3
dispersion_removed 2020-02-28 10:02:51 +01:00
Laid3acK
06f2c8e1d5
Pistol_Base_F_cleanup 2020-02-28 09:42:31 +01:00
Laid3acK
a1adf73d4b
Rifle_Short_Base_F_cleanup 2020-02-28 09:12:26 +01:00
Laid3acK
85a5e5ab8c
rifle_base_cleanup 2020-02-28 08:21:30 +01:00
Laid3acK
b64d988aa8
Rifle_Base_MX variants 2020-02-27 19:11:50 +01:00
Laid3acK
0a5f87df8c
Rifle_Long_Base_Sniper_Marksman 2020-02-27 17:30:04 +01:00
Laid3acK
8be0a8b1ca
dispersion_removed 2020-02-25 15:02:39 +01:00
PabstMirror
60155f2ab8
NightVision - Fix border missing while in FFV (#7554) 
Fix #6769
 2020-02-24 12:13:24 -06:00
Elgin675
92a987059c
French translation (#7550) 
* French translation: Fracture chance

* French translation: AdvancedBandages_EnabledCanReopen key

* French translation: BloodVolumeEffectType keys
 2020-02-23 09:26:51 -06:00
commy2
2715ef954a
Merge pull request #7549 from acemod/clamp-TreatmentAnimationSpeedModifiers 
Medical Treatment - Prevent extremely slow or fast animations
 2020-02-23 16:10:56 +01:00
commy2
ae7feae433
Merge pull request #7548 from acemod/fix-AimDownSightsBlur 
NightVision - Don't apply AimDownSightsBlur on optics with integrated night vision
 2020-02-23 16:10:19 +01:00
commy2
754a9e09af values, simplify 2020-02-23 14:25:11 +01:00
commy2
27ecfc6a5b prevent extremely slow or fast animations 2020-02-23 14:14:11 +01:00
commy2
42f710cdd0 reset effect on magnifaction transition 2020-02-23 13:52:32 +01:00
commy2
f9f1d634ae remove a debug line 2020-02-23 13:32:50 +01:00
commy2
a375e068f7 don't apply AimDownSightsBlur on optics with integrated night vision 2020-02-23 13:29:38 +01:00
commy2
a6373e936d fix MenuClosed event may not fire on menu type replacement 2020-02-23 11:59:14 +01:00
jonpas
3145a31d00
Remove requirements for usable items to be in backpack (#7545) 2020-02-23 02:11:20 +01:00
commy2
f7a880e81b
Merge pull request #7544 from acemod/fix-unconscious-interact 
Common - Add isNotUnconscious canInteractWith condition
 2020-02-22 23:12:08 +01:00
mharis001
58a0cd860b Common - Add isNotUnconscious canInteractWith condition 2020-02-22 17:07:32 -05:00
jonpas
f6af95b4a1
Arsenal - Optimize non-scope 2 mags filtering (#7543) 2020-02-22 22:26:55 +01:00
Elgin675
d63c7685b4
Update French Translations (#7440) 2020-02-22 22:15:28 +01:00
PabstMirror
1ee2e6adb2
Arsenal - Filter non-scope 2 mags from being auto-added (#7445) 2020-02-22 22:15:09 +01:00
jonpas
f6dda745c2
Medical - Combine advancedBandages and woundReopening settings (#7392) 
* Medical - Combine advancedBandages and woundReopening settings

* Improve German translation

Co-Authored-By: Jo David <github@jonathandavid.de>

* restore strings lost in merge

Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-02-22 22:09:56 +01:00
Sycholic
d5f8f93a9a
Mine Detector - Updated mine detector audio from -20db to -2db (#7460) 2020-02-22 22:09:10 +01:00
mharis001
d7f12eb49a
Medical - Use percentage sliders for chance settings (#7542) 2020-02-22 21:57:04 +01:00
padddyyy
056560e798
Update German Translations (#7469) 2020-02-22 21:53:35 +01:00
Filip Maciejewski
46e4f7c6ec
Medical Damage - Improve description of "DamageThreshold" (#7436) 2020-02-22 21:48:40 +01:00
10Dozen
b30f023c04
Adds Icon option for Low blood volume at Medical Feedback (#7507) 
* Adds Icon option for Low blood volume at Medical Feedback

- Adds setting to switch Low blood volume effect with 3 options: Color fading, Icon, Color fading + Icon
- Adds icon to UI on low blood
- Adds icon PAA files

* Review fixes

- Added ACE tags to added controls
- Added defines for GUI position/size
- Added missing newline at EOF
- Updated fnc_effectBloodVolumeIcon (removed usage of uiNamespace and minor changes)
- CBA_fnc_addSetting is now used to init settings
- Icon path macro updated to return formatted path

* Review fixes vol.2

- Removed `disableSerialization` and added default value for indicator control and not null checks to effectBVI function
- Removed defines from RscInGameUI and used a3 defines instead
- Changed formatting of macroses

* Review fixes vol.3

- Fixed exec code of BV setting
- Removed ctrlCommit from eBVI function
- Changed initEffects function to be able to update pain and BV effects only
- Changed control name from `BloodVolumeInfoIndicator` to `bloodVolumeIndicator`
- Various formatting tweaks (spaces/lines/uppercase/periods)

* Review fixed vol.4

- Remove extra checks from eBVI func
- Restores contol's onLoad script using ARR_2(QQGVAR())
 2020-02-22 14:42:59 -06:00
diwako
bd040ca19d
Medical - Fix being stuck in unconscious animation after ragdoll (#7499) 2020-02-22 21:39:14 +01:00
BaerMitUmlaut
3bc727f960
Grenades - Make flashbang reaction more authentic (#6034) 2020-02-22 21:36:25 +01:00
commy2
af777a40db
Merge pull request #7497 from Whigital/csw_mags_zeus 
CSW - Minor fixes for CSW + RHS Compats
 2020-02-22 21:33:00 +01:00
mharis001
a7bd05ddd3
Medical - Add fracture chance setting (#7396) 2020-02-22 21:31:14 +01:00
Whigital
1a2487d61f
Medical Feedback - Set volume and radio usage based current unit (#7529) 2020-02-22 21:24:47 +01:00
Laid3acK
e1f6db8a69
Ballistics - B_93x64_Ball updated (#7474) 
* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk

* 93x64_svdk
 2020-02-22 14:15:39 -06:00
Brandon Danyluk
5172e7717c
fix static weapon ammo check (#7541) 
For some reason ARMA never returns any muzzle for crewed/non crewed static weapons. Work around this by always returning whatever weapon the static weapon has no matter what
 2020-02-22 14:09:15 -06:00
Rutger "RedBery" Meijering
d6753250d1
Fixes typo in splint comparison (#7518) 2020-02-22 14:09:04 -06:00
NMAUS2019
93bd7f2e00
Use macros 
Use the defined macros
 2020-02-21 16:28:20 +11:00
mharis001
e2725e52ec
Add check for empty _ropeClass 
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2020-02-20 00:48:03 -05:00
mharis001
2dcbf2ba26 Fastroping - Fix deployAI not unwinding ropes 2020-02-20 00:28:57 -05:00
commy2
c73f64617f
Merge pull request #7523 from Whigital/isnil_conformity 
Various - Conform isNil checks across the codebase
 2020-02-19 18:09:05 +01:00
PabstMirror
c44360bd19
Medical - Unlock air controls when going uncon (#7533) 
* Medical - Unlock air controlls when going uncon

* remove unneeded parentheses

* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-02-19 10:05:05 -06:00
commy2
5a4487f1ea
Medical - fix the Enoch pilot uniform not taking damage, fix hitpoints test (#7527) 
* fix the medical hitpoints test

* fix the Enoch pilot

* readd optional test for all units

* Run test at preStart

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-02-16 18:34:46 -06:00
commy2
85709d51b3
Merge pull request #7443 from acemod/hitreactions_throwWeapon 
add function to throw current weapon
 2020-02-14 00:28:57 +01:00
commy2
d6c26eb89d
macro for throw angle 2020-02-14 00:27:01 +01:00
commy2
2d071f459f
macro for lateral offset 2020-02-13 23:47:59 +01:00
commy2
0572ead9ca
Update addons/hitreactions/functions/fnc_throwWeapon.sqf 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2020-02-13 23:15:41 +01:00
commy2
0fc3cb0201
Update addons/hitreactions/functions/fnc_throwWeapon.sqf 
Co-Authored-By: jonpas <jonpas33@gmail.com>
 2020-02-13 23:15:28 +01:00
Whigital
78d79f2761 More excessive brackets 2020-02-13 17:16:35 +01:00
Whigital
6244975316
Remove extraneous whitespaces 
Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
 2020-02-13 10:33:31 +01:00
Whigital
ab7bb11091 Remove excessive brackets 2020-02-12 22:07:57 +01:00
Whigital
8c2f53ac14 Revert quotation on string args 2020-02-12 22:07:19 +01:00
shukari
7c296c96ac
Map - Allow enabling BFT setting after mission start (#7519) 
* Update initSettings.sqf

* Bracjet

* Update XEH_postInitClient.sqf

* Update addons/map/initSettings.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-02-12 13:27:58 -06:00
Whigital
56ef0c6d65 conform isnil checking: zeus 2020-02-12 17:29:28 +01:00
Whigital
69480998ae conform isnil checking: tagging 2020-02-12 17:29:24 +01:00
Whigital
275b5edd95 conform isnil checking: spectator 2020-02-12 17:29:21 +01:00
Whigital
a24c3d52ad conform isnil checking: scopes 2020-02-12 17:29:17 +01:00
Whigital
6a8c9f0ea8 conform isnil checking: respawn 2020-02-12 17:29:13 +01:00
Whigital
1872b06235 conform isnil checking: repair 2020-02-12 17:29:08 +01:00
Whigital
22c44629f7 conform isnil checking: rearm 2020-02-12 17:29:04 +01:00
Whigital
84649c8c8d conform isnil checking: overpressure 2020-02-12 17:29:00 +01:00
Whigital
b5a0908824 conform isnil checking: modules 2020-02-12 17:28:56 +01:00
Whigital
0439cd8738 conform isnil checking: medical_treatment 2020-02-12 17:28:49 +01:00
Whigital
dbd6f39794 conform isnil checking: medical_feedback 2020-02-12 17:28:46 +01:00
Whigital
7fe5401f6a conform isnil checking: laser 2020-02-12 17:28:41 +01:00
Whigital
1def9cbcb7 conform isnil checking: interact_menu 2020-02-12 17:28:33 +01:00
Whigital
b8329e8937 conform isnil checking: gunbag 2020-02-12 17:28:28 +01:00
Whigital
c33112333e conform isnil checking: fastroping 2020-02-12 17:28:23 +01:00
Whigital
80352519e1 conform isnil checking: common 2020-02-12 17:28:18 +01:00
Whigital
2688cdd95f conform isnil checking: cargo 2020-02-12 17:28:10 +01:00
Whigital
57b411b8a4 conform isnil checking: arsenal 2020-02-12 17:27:39 +01:00
PabstMirror
dd7ae389f9 Common - Fix canDig returning non-bool (#7516) 2020-02-08 19:43:42 -06:00
Björn Dahlgren
f460eca428 Cook Off - Adjust players only settings check (#7419) 2020-02-07 21:33:09 -06:00
diwako
65e1601114
Backblast - Fix damage disabled units receiving damage from backblast (#7505) 
* Fix damage disabled units receiving damage from backblast

* Add variable check
 2020-02-07 13:27:40 -06:00
Tim Beswick
10fa22ff24
Use object itself as centre for nearEntities in getProximityPlayers (#7512) 2020-02-07 13:24:41 -06:00
SilentSpike
d1c03cec1a
Only force enable input when player is killed (#7510) 2020-02-05 23:09:58 +00:00
Whigital
cdf02f629e
Only set unconscious upon entering CA (#7503) 
Hopefully fix players being able to self interact when transitioning from cardiac arrest -> unconscious
 2020-02-04 11:17:25 +00:00
Whigital
3be84e946b
[medical_status] Enable user input between death and respawn (#7502) 
Fix being unable to use any menus created while dead
 2020-02-04 11:15:45 +00:00
Whigital
7e91ffc7a2 Update CSW author fields and remove inherited properties on ace_csw_staticAACarry 2020-01-31 18:31:48 +01:00
Whigital
62a7db5c43 Remove CSW mag defs 2020-01-30 23:21:30 +01:00
Whigital
93173d43b2 Add magazines to carryable statics 2020-01-30 23:17:15 +01:00
PabstMirror
2feeec0d7f
Medical AI - Block healing when handcuffed (#7493) 2020-01-28 19:12:38 -06:00
PabstMirror
270a5a930f
Frag - Fix spallTrack (#7492) 2020-01-28 19:12:11 -06:00
dfr1238
2e7fee5256 Update tchinese (#7490) 
Update missing string
Fix string about STR_ACE_Medical_Treatment_VehiclesAndFacilities
 2020-01-28 09:28:31 -06:00
commy2
798df92f2d
Merge pull request #7473 from diwako/allow_blood_for_none_medics 
Medical - Add setting for medic level to transfuse IVs
 2020-01-19 17:32:30 +01:00
commy2
a1c5b68c8e
Merge pull request #7475 from acemod/medical-cardiactimeout 
Medical - Increase Cardiact Arrest Time to 5 min
 2020-01-19 11:26:03 +01:00
Panisher
d9054e1c52 Overheating - Fix jamming sound (#7463) 
* This sound was heard all over the map

* secondaryWeapon changed to handgunWeapon

* add jamming sound

* add yourself to AUTHORS.txt
 2020-01-18 11:40:41 -06:00
M3ales
71da4360b8 Changed version to versionStr as fix for #7478 (#7479) 
Ensures return value of string is preserved.
 2020-01-18 11:15:49 -06:00
commy2
8a16c9da1b ACE_weaponThrown event 2020-01-18 18:12:01 +01:00
diwako
37bea2eb81 French translation by Elgin675 2020-01-17 17:45:06 +01:00
jonpas
5c1ea16fb0
Medical - Increase Cardiact Arrest Time to 5 min 2020-01-17 14:05:17 +01:00
PabstMirror
4cd087cf39 Merge branch 'master' into combine-bandage-settings 2020-01-16 21:30:40 -06:00
Taha
d8f18c685b Turkish Language Update (#7446) 
* Fatal

* Fatal

* Fatal

Turkish Language Update

* Fatal

* Update AUTHORS.txt

* Fatal

Fix

* Update AUTHORS.txt

* Update

* Delete stringtable.xml

* Update stringtable.xml

* Delete stringtable.xml

* Revert "Delete stringtable.xml"

This reverts commit 704c1e838c.

* Update stringtable.xml

* Fix

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2020-01-16 21:14:23 -06:00
diwako
c6147da1b8 Fix spelling 
Move setting above allowSelfIV
 2020-01-16 19:24:39 +01:00
Filip Maciejewski
b442f60e89
Add polish translations 2020-01-16 14:10:36 +01:00