jonpas 541f1010a7 Merge branch 'master' into macroSTR ...

Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml

2015-06-02 22:14:32 +02:00

..

fnc_canApplyHandcuffs.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_canEscortCaptive.sqf

Minor Cleanup

2015-02-06 22:24:27 -06:00

fnc_canFriskPerson.sqf

Minor Cleanup

2015-02-06 22:24:27 -06:00

fnc_canLoadCaptive.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_canRemoveHandcuffs.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_canStopEscorting.sqf

Cleanup Escort Logic

2015-02-19 14:34:14 -06:00

fnc_canSurrender.sqf

Fix not being able to UnSurrender (currentWeapon)

2015-05-10 01:47:50 -05:00

fnc_canUnloadCaptive.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_doApplyHandcuffs.sqf

#118 Sound Effect from CSE

2015-02-06 23:23:33 -06:00

fnc_doEscortCaptive.sqf

Macro STRING to LSTRING

2015-05-28 21:59:04 +02:00

fnc_doFriskPerson.sqf

Macro STRING to LSTRING

2015-05-28 21:59:04 +02:00

fnc_doLoadCaptive.sqf

Some missing private defines.

2015-04-16 12:36:16 -05:00

fnc_doRemoveHandcuffs.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_doUnloadCaptive.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_handleGetIn.sqf

Back to getIn

2015-02-16 19:20:55 -06:00

fnc_handleGetOut.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_handleKilled.sqf

#1298 - Reset handcuffs on respawn

2015-05-18 22:02:50 -05:00

fnc_handleOnUnconscious.sqf

Removed rouge system chat and diag_log messages

2015-04-05 19:42:55 +02:00

fnc_handlePlayerChanged.sqf

Surrender Fixes

2015-02-15 14:55:17 -06:00

fnc_handleRespawn.sqf

Rerun set func when respawn into captive unit

2015-03-26 14:21:26 -05:00

fnc_handleUnitInitPost.sqf

More Changes and add EH

2015-02-16 18:03:09 -06:00

fnc_handleZeusDisplayChanged.sqf

Comments

2015-02-24 10:27:53 -06:00

fnc_moduleSurrender.sqf

Transfer curator functionality from ace_captives

2015-06-01 20:44:50 +01:00

fnc_setHandcuffed.sqf

Some missing private defines.

2015-04-16 12:36:16 -05:00

fnc_setSurrendered.sqf

All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.

2015-05-21 09:42:44 -07:00

fnc_vehicleCaptiveMoveIn.sqf

Header Examples

2015-02-06 17:03:56 -06:00

fnc_vehicleCaptiveMoveOut.sqf

Header Examples

2015-02-06 17:03:56 -06:00

script_component.hpp

Captives Progress

2015-02-03 00:42:34 -06:00