17 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
SilentSpike	13201866bd	Module icon	2015-07-17 23:31:31 +01:00
jonpas	71609c70e6	Properly moved PNGs and shortened folder tree of extras/assets/icons, Added Thumbs.db to .gitignore	2015-06-29 22:21:07 +02:00
jonpas	f1f9ee1365	Added module icon, removed comment	2015-06-09 18:27:58 +02:00
SilentSpike	e3c09a7099	Added icon to unconscious module	2015-06-01 20:56:58 +01:00
SilentSpike	b72512e3f1	Zeus modules require larger icons	2015-06-01 20:44:50 +01:00
SilentSpike	cd6474c748	Adding module icons	2015-06-01 20:44:47 +01:00
PabstMirror	aa7de84783	Merge branch 'master' into mk6tweaks	2015-04-23 13:34:25 -05:00
bux578	8a55c282e1	add repair module icon	2015-04-21 13:27:45 +02:00
bux578	9184ef479a	add disarm icon, add action psd, move icon files	2015-04-12 14:47:08 +02:00
PabstMirror	656fa8868a	Module Icons	2015-04-07 19:37:46 -05:00
bux578	c44b944044	add missing icons	2015-03-25 06:32:08 +01:00
bux578	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01:00
bux578	ba42ec831b	second batch of icons	2015-03-23 20:02:35 +01:00
bux578	1114e12186	add first batch of module icons, naming conventions	2015-03-23 13:56:59 +01:00
Glowbal	5390c3668e	Added icon microDAGR	2015-03-13 18:43:21 +01:00
bux578	b6423cc011	add icons psd	2015-03-11 10:38:22 +01:00