KoffeinFlummi 1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge ... Conflicts: addons/disposable/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/javelin/stringtable.xml addons/kestrel4500/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/laserpointer/stringtable.xml addons/magazinerepack/stringtable.xml addons/maptools/stringtable.xml addons/markers/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml		2015-04-15 22:20:47 +02:00
..
functions	Remove comment	2015-04-15 01:27:29 -03: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
CfgEventHandlers.hpp	basic self actions	2015-02-18 18:58:06 -03:00
config.cpp	Fixed: Flummi missed 2 isClientSettable renames.	2015-04-14 18:38:52 -07:00
CursorMenus.hpp	- Add cursored self interaction menu (for using inside vehicles)	2015-02-28 17:48:46 -03:00
script_component.hpp	Increase the tolerance to 2m	2015-04-14 23:12:48 -03:00
stringtable.xml	Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge	2015-04-15 22:20:47 +02:00
XEH_clientInit.sqf	Move the function that prevents firing while the interact_menu is open to the interact_menu pbo	2015-04-15 01:20:20 -03:00
XEH_preInit.sqf	Move the function that prevents firing while the interact_menu is open to the interact_menu pbo	2015-04-15 01:20:20 -03:00