mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

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

Macro STRING to LSTRING

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

second batch of icons

2015-03-23 20:02:35 +01:00

$PBOPREFIX$

Added missing $PBOPREFIX$ for respawn

2015-05-11 15:17:44 -07:00

ACE_Settings.hpp

Second batch of settings files

2015-05-14 20:59:25 +02:00