ACE3/addons
PabstMirror 356a8f640a Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
..
advanced_ballistics Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
advanced_fatigue Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
advanced_throwing Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
ai Remove CfgAiSkill config changes (#5091) 2017-04-22 11:18:56 -05:00
aircraft Remove submuntion ammo changes to A-10 (#5231) 2017-06-01 20:48:35 -05:00
apl convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
atragmx Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
attach Remove maximum distance of attach to vehicle action (#5262) 2017-06-09 14:54:58 +02:00
backpacks Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
ballistics French loc fixes (ballistics) (#5041) 2017-03-26 19:39:05 -05:00
captives Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
cargo Fix some event names on wiki (#5254) 2017-06-08 14:31:27 -05:00
chemlights Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
common Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
concertina_wire Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
cookoff Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
dagr Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
disarming Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
disposable Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
dogtags Italian translation (Add & Fix) (#5193) 2017-05-23 13:44:17 -05:00
dragging Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
explosives Fix Large IED defuse distance (#5261) 2017-06-09 12:52:55 -05:00
fastroping Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
fcs Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
finger Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
flashlights Korean Translation v1.0 (#4794) 2017-01-02 17:52:01 -06:00
flashsuppressors Korean Translation v1.0 (#4794) 2017-01-02 17:52:01 -06:00
fonts convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
frag Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
gestures Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
gforces Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
goggles Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
grenades Italian translation (Add & Fix) (#5193) 2017-05-23 13:44:17 -05:00
gunbag Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
hearing Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
hellfire Cleanup unused hellfire vic stringtable (#5245) 2017-06-03 23:39:03 -05:00
hitreactions Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
huntir Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
interact_menu Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
interaction Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
inventory Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
javelin Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
kestrel4500 Minor fixes, cleanup, add lint ignore directives (#5176) 2017-05-31 22:09:36 +01:00
laser Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
laserpointer Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
logistics_uavbattery Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
logistics_wirecutter Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
magazinerepack Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
main Update required Arma 3 version to 1.70 2017-05-16 14:05:23 +02:00
map Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
map_gestures MapGesutres - Fix dependency on maptools (#5154) 2017-05-11 14:02:21 -05:00
maptools Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
markers Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
medical Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
medical_ai Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
medical_blood Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
medical_damage Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
medical_engine Fix updating body part visuals (#5141) 2017-06-08 13:50:38 -05:00
medical_menu Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
medical_treatment Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
medical_ui Add player event handler to fix zeus problems with effects (#5022) 2017-04-30 01:46:51 -05:00
microdagr Fix merge, cbaEvents, macros, cleanup 2017-05-18 12:42:02 -05:00
minedetector Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
missileguidance Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
missionmodules Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
mk6mortar Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
modules Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
movement Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
mx2a Use correct TransportX type for ace items (#5168) 2017-05-18 17:23:01 -05:00
nametags Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
nightvision Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
nlaw Italian Translation Update (#5243) 2017-06-03 22:27:51 -05:00
noidle convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
noradio convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
norearm convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
optics Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
optionsmenu Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
overheating Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
overpressure Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00
parachute Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
quickmount Italian Translation Update (#5243) 2017-06-03 22:27:51 -05:00
rangecard Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
realisticnames Add realistic names to dynamic loadout classes (#5185) 2017-05-26 07:57:46 +01:00
realisticweights Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
rearm Rearm - Pylon Support and Dynamically Add Supply Actions (#5183) 2017-06-08 11:47:52 -05:00
recoil Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
refuel Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
reload Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
reloadlaunchers Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
repair Use getUnitTrait for medics, engineers and EOD (#5246) 2017-06-10 11:41:01 +01:00
respawn Italian translation (Add & Fix) (#5193) 2017-05-23 13:44:17 -05:00
safemode Italian translation (Add & Fix) (#5193) 2017-05-23 13:44:17 -05:00
sandbag Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
scopes Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
slideshow Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
smallarms Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
spectator Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
spottingscope Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
switchunits Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
tacticalladder Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
tagging Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
thermals convert log macros to cba versions (#4282) 2016-10-02 12:55:31 +02:00
trenches Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
tripod Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
ui Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
vector Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
vehiclelock Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-13 20:43:55 +01:00
vehicles Added Pylon weapon as a valid weapon (#5250) 2017-06-05 11:15:55 -05:00
viewdistance Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
weaponselect Fix weapon select grenade count wehn using advThrow (#5244) 2017-06-04 10:07:35 -05:00
weather Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
winddeflection Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
yardage450 Conform function headers to coding guidelines (#5255) 2017-06-08 15:31:51 +02:00
zeus Merge branch 'master' into medical-rewrite 2017-06-10 10:21:18 -05:00