Glowbal 0c43c83b3d Merge branch 'master' ...

Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf

2016-09-18 11:51:21 +02:00

..

advanced_ballistics

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

advanced_fatigue

Exit fatiuge loop when dead (don't play breathing sound)

2016-09-11 22:03:20 -05:00

advanced_throwing

Fix Advanced Throwing vanilla throw block for primed throwables (#4370)

2016-09-12 19:21:04 +02:00

ai

Added beautified component names

2016-06-20 11:44:36 +02:00

aircraft

fix some rogue mission dependencies, fix #3954

2016-06-20 21:07:10 +02:00

apl

add Hiddenselection camo to bodybag for Retexturing (#4276)

2016-08-24 12:42:32 -05:00

atragmx

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

attach

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

backpacks

Added beautified component names

2016-06-20 11:44:36 +02:00

ballistics

Add ace mags to 7.62 SPAR_03 (#4340)

2016-09-05 20:33:12 +02:00

captives

Captives - rewrite findEmptyNonFFVCargoSeat (#4348)

2016-09-13 16:52:51 -05:00

cargo

Fix script error in cargo drop function (#4369)

2016-09-10 21:21:09 +02:00

chemlights

Fix pick up delay and IR chemlights, prevent picking up GL and mortar smoke shells (#4336)

2016-09-05 20:23:03 +02:00

common

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

concertina_wire

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

cookoff

Merge pull request #4383 from acemod/support-disable-cookoff

2016-09-17 18:50:34 +02:00

dagr

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

disarming

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

disposable

convert common events to CBA playerEvents

2016-06-22 01:39:20 +02:00

dogtags

Czech translation (#4241)

2016-08-13 15:44:48 +02:00

dragging

Added additional cargo and dragging for crates (#4129)

2016-08-13 11:33:41 +02:00

explosives

Use directCall on tripflare effect

2016-09-08 21:22:32 +02:00

fastroping

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

fcs

Fix missing zeroing UI on vehicles without FCS

2016-08-11 22:34:38 +02:00

finger

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

flashlights

Merge branch 'flashlight_housekeeping' of https://github.com/voiperr/ACE3 into voiperr-flashlight_housekeeping

2016-08-25 15:50:11 -05:00

flashsuppressors

Added beautified component names

2016-06-20 11:44:36 +02:00

fonts

Added beautified component names

2016-06-20 11:44:36 +02:00

frag

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

gestures

Fix stop gesture keybind (#4354)

2016-09-07 21:07:51 +02:00

gforces

Russian Translations - Update (#4217)

2016-08-13 11:25:43 +02:00

goggles

Russian Translations - Update (#4217)

2016-08-13 11:25:43 +02:00

grenades

fix a comment

2016-09-16 14:00:43 +02:00

gunbag

Czech translation (#4241)

2016-08-13 15:44:48 +02:00

hearing

Remove superfluous requiredAddons in hearing

2016-08-20 21:10:37 +02:00

hitreactions

Added beautified component names

2016-06-20 11:44:36 +02:00

huntir

Use GVAR where applicable

2016-07-20 07:15:18 +03:00

interact_menu

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

interaction

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

inventory

Russian Translations - Update (#4217)

2016-08-13 11:25:43 +02:00

javelin

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

kestrel4500

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

laser

Fix script errors (#4327)

2016-09-04 21:03:52 +02:00

laser_selfdesignate

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

laserpointer

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

logistics_uavbattery

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

logistics_wirecutter

lower wirecutter item mass (#4209)

2016-08-08 15:18:51 -05:00

magazinerepack

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

main

Prep 3.7.0 release

2016-09-12 19:47:31 +02:00

map

Fix merge (was moved to XEH_postInitServer)

2016-08-25 18:56:57 -05:00

map_gestures

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

maptools

Russian Translations - Update (#4217)

2016-08-13 11:25:43 +02:00

markers

Added beautified component names

2016-06-20 11:44:36 +02:00

medical

Merge branch 'master'

2016-09-18 11:51:21 +02:00

medical_ai

Disable medical AI for remote controlled AI

2016-09-12 17:06:14 +02:00

medical_damage

integrate medical-engine handledamage into medical-damage component

2016-08-27 09:39:24 +02:00

medical_engine

remove static fix from vmedical component

2016-08-27 08:50:55 +02:00

medical_menu

Merge branch 'master'

2016-09-18 11:51:21 +02:00

medical_treatment

Fix some efuncs

2016-08-09 12:47:59 -05:00

medical_ui

Add first step in medical rewrite

2016-06-30 17:33:29 +02:00

microdagr

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

minedetector

Czech translation (#4241)

2016-08-13 15:44:48 +02:00

missileguidance

Fix script errors (#4327)

2016-09-04 21:03:52 +02:00

missionmodules

Added beautified component names

2016-06-20 11:44:36 +02:00

mk6mortar

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

modules

Added beautified component names

2016-06-20 11:44:36 +02:00

movement

convert common events to CBA playerEvents

2016-06-22 01:39:20 +02:00

mx2a

Added beautified component names

2016-06-20 11:44:36 +02:00

nametags

Add fade nametags towards screen border (#4316)

2016-09-04 20:50:12 +02:00

nightvision

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

noidle

Added beautified component names

2016-06-20 11:44:36 +02:00

noradio

ad fix for noradio

2016-08-23 22:43:37 -05:00

norearm

Added beautified component names

2016-06-20 11:44:36 +02:00

optics

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

optionsmenu

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

overheating

Add spare barrel to VA in 1.64 (#4328)

2016-09-04 21:26:15 +02:00

overpressure

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

parachute

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

rangecard

Use GVAR where applicable

2016-07-20 07:15:18 +03:00

realisticnames

Czech translation (#4241)

2016-08-13 15:44:48 +02:00

realisticweights

Add realistic weights (#3868)

2016-09-04 11:07:36 +02:00

rearm

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

recoil

Added beautified component names

2016-06-20 11:44:36 +02:00

refuel

Refuel nozzle taking, disconnecting, connecting and returning interaction fixes (#4337)

2016-09-05 20:23:28 +02:00

reload

Add ACE_isBelt for DLC/Expansion magazines

2016-08-14 13:35:00 -05:00

reloadlaunchers

Added beautified component names

2016-06-20 11:44:36 +02:00

repair

offset for quad engine smoke, delete destroyed RepairItem s

2016-09-16 13:51:41 +02:00

respawn

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

safemode

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

sandbag

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

scopes

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

sitting

Added beautified component names

2016-06-20 11:44:36 +02:00

slideshow

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

smallarms

Fix UBC for 1.62 Apex

2016-06-25 21:07:30 -05:00

spectator

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

spottingscope

Tweak spotting scope anims / mem points

2016-07-06 16:55:54 -05:00

switchunits

Russian Translations - Update (#4217)

2016-08-13 11:25:43 +02:00

tacticalladder

convert common events to CBA playerEvents

2016-06-22 01:39:20 +02:00

tagging

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

thermals

Added beautified component names

2016-06-20 11:44:36 +02:00

trenches

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

tripod

don't let tripod fall over as easily (#4352)

2016-09-06 21:55:23 +02:00

ui

Cache config UI (#4234)

2016-08-18 19:07:05 +02:00

vector

Fix params

2016-09-04 20:37:25 +02:00

vehiclelock

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

vehicles

Add missing vanilla magazines to LMG_Minigun

2016-07-12 13:17:29 -05:00

viewdistance

convert common events to CBA playerEvents

2016-06-22 01:39:20 +02:00

weaponselect

Fix Advanced Throwing vanilla throw block for primed throwables (#4370)

2016-09-12 19:21:04 +02:00

weather

only disable auto-weather settings by default, but keep them toggleable

2016-06-25 21:46:24 +02:00

winddeflection

Minor optimizations using private, params, and isEqualType (#4323)

2016-09-04 16:44:22 +02:00

yardage450

Added beautified component names

2016-06-20 11:44:36 +02:00

zeus

Revert "Delete "Group Side" module after use"

2016-09-17 01:01:37 +03:00