SilentSpike 159937dc45 Merge branch 'master' into ace_spectator ...

Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd

2015-07-26 14:15:24 +01:00

..

data

You can no longer connect to destroyed HuntIR cameras

2015-06-14 12:54:10 +02:00

functions

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

UI

Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder

2015-06-11 21:28:44 +02:00

$PBOPREFIX$

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

CfgAmmo.hpp

Removed HuntIR explosion sound

2015-06-07 12:48:01 +02:00

CfgCloudlets.hpp

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

CfgEventhandlers.hpp

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

CfgMagazines.hpp

Fixed 'spotterscope' typo; Moved m_m1070.paa into \data folder

2015-06-11 21:28:44 +02:00

CfgVehicles.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

CfgWeapons.hpp

Fixed incorrect CSTRING

2015-06-10 18:10:12 +02:00

config.cpp

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

Dialog.hpp

Macroize huntIR

2015-06-07 12:39:24 -05:00

RscTitles.hpp

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

script_component.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

stringtable.xml

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

XEH_postInit.sqf

ACE2 HuntIR port

2015-06-06 14:13:34 +02:00

XEH_preInit.sqf

Added 'parachute' and 'camera' hitpoints to the HuntIR model:

2015-06-14 12:25:56 +02:00