131 Commits

Author	SHA1	Message	Date
esteldunedain	a041555381	Add an animation and progressbar to the "Check spare barrels temperatures" action	2016-03-01 18:16:14 -03:00
esteldunedain	bc4a338d32	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation	2016-03-01 17:15:14 -03:00
Jonathan Pereira	309f48ee0b	Added remaining PT-BR translarions	2016-03-01 08:56:43 -03:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
esteldunedain	b8f955468c	First version of "Check spare barrel temperatures" action	2016-02-27 01:46:27 -03:00
jonpas	10abe5cd57	Merge branch 'master' into German-translations	2016-02-27 01:36:07 +01:00
System98	e587744b3e	Fix text errors ... - Fix errors in "map_gestures, medical, overheating, slideshow and zeus" addons	2016-02-26 11:29:55 +01:00
System98	48d312cb8e	Add german translations ... - add missing german translations - small fixes to existing texts - remove unused strings in "medical" addon	2016-02-25 18:10:26 +01:00
gienkov	d4209b2b42	mk6 tagging and overheating translation, finish	2016-02-25 17:16:36 +01:00
esteldunedain	64a62d65fc	More spanish translations	2016-02-25 11:46:56 -03:00
Nicolás Badano	91e671085e	Merge pull request #3371 from acemod/moreSevereJamming ... More severe jamming	2016-02-25 09:56:08 -03:00
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +01:00
PabstMirror	6dc0d7d4f5	Merge branch 'master' into moreSevereJamming	2016-02-22 14:57:40 -06:00
esteldunedain	e4e2f0d661	Add a 10% chance for the unjam action to fail (like in ACE2)	2016-02-20 21:09:52 -03:00
esteldunedain	2dbf979ec6	By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)	2016-02-20 20:05:59 -03:00
licht-im-Norden87	073a476ed1	Update German Stringtable ... Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)	2016-02-20 22:57:45 +01:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
bux	49f565f541	fix merging errors	2016-02-18 20:05:30 +01:00
licht-im-Norden87	9419e7daf3	overheating	2016-02-10 17:35:36 +01:00
gienkov	d5dd718b8d	fix endlines	2016-02-09 12:01:13 +01:00
gienkov	fafd25dee7	pl translation	2016-02-09 11:50:35 +01:00
SzwedzikPL	270b557084	fix overheating stringtable	2016-02-05 04:55:05 +01:00
esteldunedain	2f7cac68a5	Small fixes	2016-01-20 10:59:58 -03:00
esteldunedain	9bcabd081b	Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off).	2016-01-19 17:24:01 -03:00
PabstMirror	e587a6e6e3	Modernize code	2015-12-28 16:04:56 -06:00
jonpas	6f6f2a55f0	Stringtable fixes except medical	2015-05-27 21:43:30 +02:00
Bla1337	a7d66b59cf	transaltions	2015-05-03 14:01:35 +03:00
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
Dimaslg	f8d5c423ae	Merge conflicts resolved	2015-04-29 21:15:22 +02: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
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
ulteq	d0c7a37841	Minor stringtable fix	2015-04-28 18:31:14 +02:00
ulteq	dc09c554c0	Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master ... Conflicts: addons/medical/stringtable.xml addons/mk6mortar/stringtable.xml	2015-04-28 17:44:58 +02:00
Josuan Albin	e8dec708bc	Some french entries and a german duplicate ... Added some french entries and removed a german duplicate	2015-04-27 16:18:28 +02:00
Grzegorz Sikora	a272258500	PL translation	2015-04-26 22:59:20 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
KoffeinFlummi	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02: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
nomisum	8813315f36	added missing translations german	2015-04-17 11:40:31 +02:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
ruPaladin	d8eb564c65	Update stringtable.xml	2015-04-15 19:52:29 +03:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +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
esteldunedain	6f4bb48489	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/attach/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/laser_selfdesignate/stringtable.xml addons/magazinerepack/stringtable.xml addons/overheating/stringtable.xml extensions/CMakeLists.txt	2015-04-14 19:09:57 -03:00
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
Harakhti	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +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	c2253cf199	Update stringtable.xml	2015-04-13 01:30:16 +02:00
simon84	51bc7208bc	German translation ... Some german translations and corrections	2015-04-12 20:52:15 +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	400b8f4270	Update stringtable.xml	2015-04-12 14:14:48 +02:00
esteldunedain	0565eb6c74	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment ... Conflicts: addons/laser_selfdesignate/stringtable.xml	2015-04-12 01:26:55 -03:00
esteldunedain	7b797d906f	Merge branch 'master' into linearMenuExperiment ... Conflicts: addons/interact_menu/functions/fnc_renderIcon.sqf addons/overheating/stringtable.xml	2015-04-12 00:19:33 -03: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
licht-im-Norden87	a30eabfb1d	Update stringtable.xml	2015-04-12 03:30:11 +02:00
esteldunedain	488000bdf3	Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494	2015-04-11 19:34:29 -03: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
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
Legolasindar	470a12ed46	Update stringtable.xml ... added spanish translation	2015-04-10 13:19:26 +02:00
Anthariel	fb8c49135e	Update stringtable.xml ... Added: French Translation (100%)	2015-04-10 05:43:42 +02:00
Grzegorz	03faa32cef	overheating PL translation	2015-04-10 02:07:19 +02:00
licht-im-Norden87	fb5189be9a	Overheating	2015-04-10 00:38:51 +02:00
esteldunedain	a658cafb4e	Remove line breaks from actions	2015-04-04 01:45:03 -03: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
Glowbal	2250255d65	Clientside display text option for weapon jamming	2015-03-08 16:57:06 +01:00
Nicolás Badano	1db298722b	CBAfy AGM_Overheating	2015-01-13 00:23:14 -03:00
Nicolás Badano	c0df8b7f54	Pre CBA AGM_Overheating	2015-01-12 23:43:38 -03:00