esteldunedain
|
d6e70cfe6b
|
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 16:20:18 -03:00 |
|
Legolasindar
|
df31442599
|
Update stringtable.xml
added spanish terms
|
2015-04-10 01:13:33 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
Garth L-H de Wet
|
9d7d71b1b1
|
Changed the tabs to 4 spaces. Hopefully.
|
2015-04-06 22:20:11 +02:00 |
|
Garth L-H de Wet
|
44c597f7c5
|
Explosives, 2 spaces to 4 space tab.
|
2015-04-06 22:10:00 +02:00 |
|
Garth L-H de Wet
|
9c13a87d83
|
Merge branch 'master' into explosiveInteraction
|
2015-03-31 17:21:55 +02:00 |
|
Garth L-H de Wet
|
37fe824426
|
Added pickup action to put down explosives.
|
2015-03-31 17:12:12 +02:00 |
|
Nicolás Badano
|
a823fb2dca
|
Tweaks on action names to:
- Remove >> for submenus
- Split long action names in two lines
|
2015-03-24 00:16:32 -03:00 |
|
Garth L-H de Wet
|
5e67de4d66
|
Ported AGM_Explosives to ace.
Marked locations where Scheduled Delay Execution will probably need to be used.
|
2015-01-12 11:48:26 +02:00 |
|