7 Commits

Author	SHA1	Message	Date
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
jonpas	d934c25b78	Merge branch 'master' into macroSTR ... Conflicts: addons/interact_menu/ACE_Settings.hpp	2015-05-30 19:54:32 +02:00
jonpas	6072e14077	Changed all strings to macros (except external)	2015-05-27 19:04:25 +02:00
PabstMirror	3daec7d98d	Fix UAV and Interaction Compile Inheritance	2015-05-17 13:51:59 -05:00
PabstMirror	0805d5b640	Update UAV battery icon from AGM	2015-04-11 16:48:49 -05:00
Nicolás Badano	f7d5d615ee	allow actions to be defined for different selections	2015-02-19 15:36:27 -03:00
PabstMirror	4b1e40570e	Port AGM: Logistics-UAV refuel/recharage	2015-01-28 14:29:43 -06:00