344 Commits

Author	SHA1	Message	Date
KoffeinFlummi	b563bf8a8e	Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-14 15:04:42 +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
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +02:00
bux578	0e6eb46bb4	Merge pull request #560 from gienkov/master ... Further PL translation fixes	2015-04-13 19:18:54 +02:00
commy2	fa64225e55	Merge pull request #505 from acemod/muteunit ... Muteunit framework, fix #473	2015-04-13 19:18:45 +02:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +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	7523dd011f	Update stringtable.xml	2015-04-13 02:06:17 +02:00
PabstMirror	74967910a3	opps	2015-04-12 18:27:55 -05:00
PabstMirror	d50bff866b	addToInventory use addMagazineArray -maybe fix #530	2015-04-12 18:27:25 -05:00
Anthariel	8d79fd242a	Update stringtable.xml ... Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)	2015-04-12 18:18:52 +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
licht-im-Norden87	7eaee37ff6	Update stringtable.xml	2015-04-12 13:48:59 +02:00
commy2	e87f491470	mute implementation in noradio, handle post init on remote units	2015-04-12 11:17:58 +02:00
commy2	54f29d75f5	functions to mute unit	2015-04-12 10:05:49 +02:00
commy2	018854a7c3	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit	2015-04-12 09:15:45 +02:00
PabstMirror	78b64ea273	Missing English	2015-04-12 01:36:41 -05:00
bux578	2fc7f44c39	french translation, tabler 4 spaces test	2015-04-12 07:50:23 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
KoffeinFlummi	5108137302	Merge https://github.com/Ricciardino/ACE3 into italian-merge	2015-04-12 04:38:46 +02:00
licht-im-Norden87	bd07e18b43	Update stringtable.xml	2015-04-12 03:26:45 +02:00
jaynus	2a2f96a034	ACRE API functions and core functions were incorrect.	2015-04-11 14:10:30 -07:00
jaynus	458c49b0a7	Merge remote-tracking branch 'origin/master' into javelinLocking ... Conflicts: addons/common/XEH_preInit.sqf	2015-04-11 14:01:47 -07: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
commy2	b9077888aa	unmute handleing	2015-04-11 20:26:43 +02:00
Kllrt	12f87013b2	Merge branch 'master' of https://github.com/acemod/ACE3	2015-04-11 19:38:28 +02:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
commy2	761e4aec64	edit description	2015-04-11 16:27:04 +02:00
commy2	62b45a8a07	initial commit	2015-04-11 15:59:21 +02:00
commy2	9cf44b1d32	initial commit	2015-04-11 15:46:41 +02:00
jaynus	4188893839	Move spatial model translations to ace_common	2015-04-10 14:23:55 -07:00
jaynus	0a88220fc2	Constraints work, added worldToScreenBounds to common.	2015-04-10 14:20:06 -07:00
commy2	11ad74735c	Merge pull request #458 from Tenga/master ... Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera	2015-04-10 22:12:55 +02:00
PabstMirror	adc7db9ae9	#456 - Fix AI rotating while dead (disableAI func) ... Still some small head movements, but I don't know how to fix that.	2015-04-10 15:02:40 -05:00
commy2	2a72e183b1	Merge pull request #450 from Tenga/master ... Count the commander camera as a 3rd person camera	2015-04-10 21:54:52 +02:00
Tenga	229590ed20	Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera	2015-04-10 21:54:47 +02:00
Tenga	c8cff6e91c	- Added isFeatureCameraActive to ace_common ... - ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature	2015-04-10 21:48:24 +02:00
PabstMirror	661ddc3562	#441 - Crash with no model on ace_fakeweapon	2015-04-10 14:35:08 -05:00
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
Riccardo Petricca	d9e78e511e	Added italian translation to the last terms. ... Added italian translation to the last added terms.	2015-04-10 21:13:03 +02:00
ruPaladin	d198cb25e9	Update stringtable.xml	2015-04-10 20:37:21 +03:00
commy2	5d097c4dd9	add comment explaining why isNumber is used	2015-04-10 19:11:51 +02: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
commy2	c03ee8e9c6	lowercase gps	2015-04-10 18:34:26 +02:00