KoffeinFlummi a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/kestrel/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/logistics_uavbattery/stringtable.xml addons/logistics_wirecutter/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml		2015-04-29 12:52:55 +02:00
..
functions	Don't check intersection if distance < 1m	2015-04-29 02:34:47 -05:00
ui	Make interac_menu work in real 2D:	2015-03-23 18:08:31 -03:00
$PBOPREFIX$	Initial nou menu commit.	2015-01-18 10:38:27 -08:00
CfgActions.hpp	hide open bag option when it's not selected via scroll wheel	2015-04-20 22:00:13 +02:00
CfgEventHandlers.hpp	basic self actions	2015-02-18 18:58:06 -03:00
config.cpp	isClientSettable spelling	2015-04-28 14:09:26 -05:00
CursorMenus.hpp	- Add cursored self interaction menu (for using inside vehicles)	2015-02-28 17:48:46 -03:00
script_component.hpp	#828 - Private Variables for Interact Menu	2015-04-29 01:26:13 -05:00
stringtable.xml	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge	2015-04-29 12:52:55 +02:00
XEH_clientInit.sqf	#828 - Private Variables for Interact Menu	2015-04-29 01:26:13 -05:00
XEH_preInit.sqf	cache ctrlSetStructedText parseText	2015-04-25 13:28:21 +02:00