79 Commits

Author	SHA1	Message	Date
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
KoffeinFlummi	06a4f3d10e	Remove tabler comments.	2015-04-20 15:48:50 +02:00
Grzegorz Sikora	8530684fa6	PL fix #2	2015-04-19 23:09:11 +02:00
KoffeinFlummi	592e0d2dd3	Merge https://github.com/ruPaladin/ACE3 into russian-merge ... Conflicts: addons/ballistics/stringtable.xml addons/interact_menu/stringtable.xml addons/medical/stringtable.xml	2015-04-19 00:51:09 +02:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
ruPaladin	af876e3370	attach	2015-04-17 15:27:53 +03:00
PabstMirror	638433614c	Some missing private defines.	2015-04-16 12:36:16 -05:00
Tachii	dca11e523b	Update stringtable.xml	2015-04-16 18:08:58 +03:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
KoffeinFlummi	96319c8799	Merge https://github.com/ruPaladin/ACE3 into russian-merge	2015-04-14 12:50:14 +02:00
commy2	804079cfae	manual merge	2015-04-13 20:20:55 +02:00
Harakhti	3c3f6ba4c3	Translation: A to I ... Some parts filled out, other parts corrected or stylized.	2015-04-13 19:28:58 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
Anthariel	3ee421a233	Update stringtable.xml ... Wrong french translation for the line 173.	2015-04-12 18:08:06 +02:00
KoffeinFlummi	614afa8537	Merge https://github.com/Kllrt/ACE3 into czech-merge ... Conflicts: addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/goggles/stringtable.xml addons/grenades/stringtable.xml addons/hearing/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/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-12 14:27:59 +02:00
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
ruPaladin	9c8c38aaae	Update stringtable.xml	2015-04-10 20:28:05 +03:00
EpMAK	17a552bb80	Russian Translation ... Russian translation of stringtables: new lines + old lines fixed a bit, realistic names for armory are not yet filled.	2015-04-10 19:55:57 +03:00
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Jo David	33a14076fc	Merge branch 'master' of https://github.com/acemod/ACE3 into translations ... Conflicts: addons/captives/stringtable.xml addons/medical/stringtable.xml	2015-04-10 09:01:24 +02:00
Kavinsky	a118cae13d	unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item	2015-04-10 04:36:28 +02:00
Kavinsky	b49fec58e6	Updated stringtable	2015-04-10 04:35:21 +02:00
Kavinsky	adaee74a57	removed config redundancy	2015-04-10 04:00:26 +02:00
Kavinsky	999ad49fd0	removed duplicated debugging error	2015-04-10 03:58:14 +02:00
Grzegorz	3ffd7ac8c7	attach PL translation	2015-04-10 03:57:55 +02:00
Kavinsky	049edd1483	Added ACE Attach posibility to add more types of attachable items	2015-04-10 03:49:50 +02:00
VyMajoris	f0a97bd855	Added - Portuguese translation to Attach Failed	2015-04-09 20:20:08 -03:00
Legolasindar	7b4d62c46c	Update stringtable.xml ... Fixed spanish terms	2015-04-10 00:05:47 +02:00
bux578	92da20ce62	translations ... #367	2015-04-07 10:02:33 +02:00
jaynus	1bb6be5654	Cleaning up of all tabs in source code files.	2015-04-06 09:22:43 -07:00
Nou	6541600d44	Switch everything to use modelToWorldVisual instead of modelToWorld.	2015-04-03 15:26:27 -07:00
PabstMirror	47c72ac4ae	Disable Debug Laser / Commenting	2015-03-27 12:08:05 -05:00
PabstMirror	4d62865ea2	Stop placement on interact_menu open	2015-03-27 11:53:04 -05:00
PabstMirror	91a1ed3264	Cancle attach action	2015-03-27 11:36:31 -05:00
PabstMirror	86c7776802	and this	2015-03-27 11:14:19 -05:00
PabstMirror	f43666eb93	Use CBA PFEH instead of BI stacked	2015-03-27 11:14:04 -05:00
PabstMirror	51e8dbf53f	misc	2015-03-27 00:12:39 -05:00
PabstMirror	d03e474075	Replace selection dialog with interact children	2015-03-27 00:02:54 -05:00
PabstMirror	efe57461b5	misc	2015-03-26 20:05:30 -05:00
PabstMirror	9ae4f39d05	Binary Seach for attach pos	2015-03-26 17:49:11 -05:00
Nicolás Badano	5e79970740	Switching nicknames	2015-03-24 01:18:00 -03:00
PabstMirror	20362e8dc9	Cleanup exception names	2015-03-23 15:22:26 -05:00
Nicolás Badano	526e765144	Added base main actions for vehicle ancestors	2015-03-01 01:35:06 -03:00
Nicolás Badano	2b0cfac8e4	Removed obsolote code from ace_interaction (#109)	2015-02-28 23:00:24 -03:00