144 Commits

Author	SHA1	Message	Date
KoffeinFlummi	761e23001f	Merge https://github.com/Dimaslg/ACE3 into spanish-merge ... Conflicts: addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/optionsmenu/stringtable.xml	2015-05-01 16:51:20 +02:00
ulteq	2c97b20781	Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master ... Conflicts: addons/atragmx/stringtable.xml addons/ballistics/stringtable.xml addons/medical/stringtable.xml addons/missileguidance/stringtable.xml addons/overheating/stringtable.xml addons/realisticnames/stringtable.xml addons/vehiclelock/stringtable.xml	2015-04-30 13:20:31 +02:00
PabstMirror	41bef1e58c	Merge pull request #903 from acemod/vehLockFix ... Veh lock fix	2015-04-29 13:34:38 -05:00
NukeDev	d4dc5e6d85	Other Fixes 2	2015-04-29 17:22:20 +02:00
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
PabstMirror	9e0932eb56	Opps	2015-04-28 13:31:47 -05:00
PabstMirror	270f9f3662	Fix init order problem	2015-04-28 13:26:52 -05:00
PabstMirror	f8b8d7dd16	Set Lock on postInit so spawned vehicles are set	2015-04-28 00:08:28 -05:00
VyMajoris	523cb49ff1	Added - Portuguese translation to lots of things. ... Also fixed a typo the english key for STR_ACE_microdagr_configure.	2015-04-26 03:09:16 -03:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
Nicolás Badano	1bfb13abac	Revert "remove author from items inheriting ACE_ItemCore"	2015-04-21 19:07:42 -03:00
bux578	3897b73d56	remove author from items inheriting ACE_ItemCore	2015-04-21 19:16:54 +02:00
PabstMirror	00f26144ec	More Privates	2015-04-17 15:45:00 -05:00
KoffeinFlummi	20e4858a0d	Merge https://github.com/ramius86/ACE3 into italian-merge	2015-04-17 15:44:50 +02:00
EpMAK	c2214efeb1	Russian stringtables finished ... Filled all the missing lines, little errors fixed.	2015-04-17 14:54:28 +03:00
Marco	5e7fb0fb64	Update stringtable.xml ... IT	2015-04-16 10:18:49 +02: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
Harakhti	e7e46b3b59	Translation: S to W ... That's all I've found so far.	2015-04-14 00:05:39 +02:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +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
PabstMirror	db5861da52	#428 - GJ Git	2015-04-10 13:05:39 -05:00
PabstMirror	33570c94e4	#428 - Only work on locked vehicles.	2015-04-10 13:05:39 -05:00
commy2	5ea35a01bb	sorting out required addons for modularity	2015-04-09 13:23:29 +02:00
bux578	60c50e0daf	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons	2015-03-24 19:12:23 +01:00
PabstMirror	8346de8150	vehLock disable debug rpt spam	2015-03-24 04:01:20 -05:00
bux578	ba42ec831b	second batch of icons	2015-03-23 20:02:35 +01:00
PabstMirror	d4624982f6	Update readme.md	2015-03-15 13:13:13 -05:00
PabstMirror	f101d40450	Readme cleanup	2015-03-15 13:10:06 -05:00
PabstMirror	726bf8d407	Headers, Formating, Fixes, Lock Inventory Option	2015-03-15 11:27:21 -05:00
commy2	b5f307919e	replace canInteract with canInteractWith	2015-03-15 13:00:10 +01:00
Nicolás Badano	716eb72d16	Prevent ace_vehiclelock from overwritting mainaction distance	2015-03-01 19:35:18 -03:00
Nicolás Badano	f7d5d615ee	allow actions to be defined for different selections	2015-02-19 15:36:27 -03:00
PabstMirror	fb3a610649	Fix bad STR_ACE_Common_ACETeam	2015-02-14 00:39:09 -06:00
Nicolás Badano	74d0ae95ff	Change ACE_Settings from modules	2015-02-03 02:53:02 -03:00
Nicolás Badano	981978d043	ACE_Settings: replace all ACE_Parameters	2015-01-30 19:06:25 -03:00
PabstMirror	9631154926	Set ADDON variable in XEH_preInit	2015-01-29 01:38:46 -06:00
PabstMirror	c14514a3f9	VehLock - canInteract check	2015-01-27 20:11:06 -06:00
PabstMirror	5bfaf7da7d	VehLock - new progessBar	2015-01-27 19:49:21 -06:00
PabstMirror	0ca2cb34ea	setVariable names	2015-01-24 12:58:01 -06:00
PabstMirror	09eb5d6c65	Update readme.md	2015-01-24 12:48:28 -06:00
PabstMirror	04d4d5b9ec	Readme	2015-01-24 12:45:11 -06:00
PabstMirror	4e31a4b57f	First Pass	2015-01-23 16:40:39 -06:00
PabstMirror	5c8614f11c	Port Vehicle Lock Inital	2015-01-23 16:14:22 -06:00