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

..

functions

Merge branch 'master' into macroSTR

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

$PBOPREFIX$

add PBO to drag objects

2015-03-14 12:05:43 +01:00

CfgEventHandlers.hpp

Remove Duplicate Mortar Code (inherit from statics)

2015-04-03 19:07:13 -05:00

CfgMovesBasic.hpp

Fix Dragging StanceChange Anim

2015-04-28 15:40:36 -05:00

CfgVehicles.hpp

tweaks, carry static weapons

2015-03-18 13:36:22 +01:00

config.cpp

Fix Dragging StanceChange Anim

2015-04-28 15:40:36 -05:00

script_component.hpp

tweak carry stance req., timeout certain PFH, exit PFH, debug

2015-03-25 20:18:23 +01:00

stringtable.xml

Added: Italian translation from Blackedsoul p#20

2015-05-10 11:05:16 +02:00

XEH_clientInit.sqf

detach when entering a vehicle, don't mess up animation insidea vehicle

2015-03-25 21:51:50 +01:00

XEH_preInit.sqf

start carrying phase

2015-03-24 21:37:27 +01:00

XEH_serverInit.sqf

handle dc is the same fnc as handle killed

2015-03-18 16:02:01 +01:00