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_addCellphoneIED.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_addClacker.sqf

Macro STRING to LSTRING

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

fnc_addDetonateActions.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_addExplosiveActions.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_addToSpeedDial.sqf

Changed the tabs to 4 spaces. Hopefully.

2015-04-06 22:20:11 +02:00

fnc_addTransmitterActions.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_addTriggerActions.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_canDefuse.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_canDetonate.sqf

Fixed incorrect indenting with headers in explosives.

2015-02-02 10:35:17 +02:00

fnc_defuseExplosive.sqf

Create Defuse Helpers on demand

2015-05-27 14:09:06 -05:00

fnc_detonateExplosive.sqf

Create Defuse Helpers on demand

2015-05-27 14:09:06 -05:00

fnc_dialingPhone.sqf

Switch everything to use modelToWorldVisual instead of modelToWorld.

2015-04-03 15:26:27 -07:00

fnc_dialPhone.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_getDetonators.sqf

Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix

2015-04-29 21:32:28 +02:00

fnc_getPlacedExplosives.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_getSpeedDialExplosive.sqf

Changed the tabs to 4 spaces. Hopefully.

2015-04-06 22:20:11 +02:00

fnc_handleScrollWheel.sqf

Random clean ups and explosive can now detonate with their object.

2015-04-01 20:43:18 +02:00

fnc_hasExplosives.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_hasPlacedExplosives.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_interactEH.sqf

Create Defuse Helpers on demand

2015-05-27 14:09:06 -05:00

fnc_module.sqf

Private Variables

2015-04-29 00:05:02 -05:00

fnc_onInventoryChanged.sqf

Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.

2015-05-28 17:56:45 +02:00

fnc_onKilled.sqf

Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.

2015-05-28 17:56:45 +02:00

fnc_onLanded.sqf

Attach the real explosive

2015-04-28 23:57:11 -05:00

fnc_openTimerSetUI.sqf

Macro STRING to LSTRING

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

fnc_place_Approve.sqf

Explosives - Local Defuse Helpers

2015-05-26 23:15:50 -05:00

fnc_place_Cancel.sqf

Changed the tabs to 4 spaces. Hopefully.

2015-04-06 22:20:11 +02:00

fnc_placeExplosive.sqf

Create Defuse Helpers on demand

2015-05-27 14:09:06 -05:00

fnc_removeFromSpeedDial.sqf

Changed the tabs to 4 spaces. Hopefully.

2015-04-06 22:20:11 +02:00

fnc_selectTrigger.sqf

rename cfgAce_Triggers to ACE_Triggers

2015-04-10 05:56:19 +02:00

fnc_setPosition.sqf

Changed the tabs to 4 spaces. Hopefully.

2015-04-06 22:20:11 +02:00

fnc_setSpeedDial.sqf

Fixed various points raised in the PR.

2015-02-19 15:30:01 +02:00

fnc_setupExplosive.sqf

Macro STRING to LSTRING

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

fnc_startDefuse.sqf

Macro STRING to LSTRING

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

fnc_startTimer.sqf

Attach the real explosive

2015-04-28 23:57:11 -05:00

fnc_triggerType.sqf

Attach the real explosive

2015-04-28 23:57:11 -05:00

script_component.hpp

Added the function's script_component.hpp that includes the correct file. To reduce potential pain areas if a rename occurs.

2015-01-13 23:21:31 +02:00