125 Commits

Author	SHA1	Message	Date
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	e422388484	fix waitUntil capitalization	2015-11-30 17:28:01 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	a8228f60c2	fix configFile capitalization	2015-11-30 17:23:02 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
gienkov	7eecff4296	Merge remote-tracking branch 'origin' into pl-translation ... Conflicts: addons/captives/stringtable.xml addons/map_gestures/stringtable.xml addons/zeus/stringtable.xml	2015-11-27 21:19:25 +01:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
kaban	e2763dde27	Russian Translations - Update	2015-11-05 03:28:53 +03:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
Jonathan Pereira	ce5364d7af	Added PT-BR translations ... Added all remaining translations, including dagr, dragging, map, map_gestures, medical, repair, tacticalladder and zeus.	2015-10-26 22:04:03 -02:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
jonpas	b345db4ae9	Added Zeus modules for adding Spare Tracks and Wheels	2015-09-27 00:29:19 +02:00
KoffeinFlummi	3471ebef16	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
kaban	341e122e4c	Russian Translations - Update	2015-09-17 11:43:14 +03:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	a5621604fd	Merge branch 'release' into czech	2015-09-10 20:51:33 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
[OMCB]kaban	298b475433	Fix due to review	2015-09-05 05:15:29 +03:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
ProfessorCZ	44fa520bdd	Czech Translations - Update	2015-09-03 01:20:24 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
gienkov	96c3b62cb9	zeus translation	2015-08-22 00:19:51 +02:00
SilentSpike	5112bd9bdf	Merge pull request #2163 from acemod/add-objects-to-curator ... Add objects to all curators	2015-08-21 13:53:45 +01:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
SilentSpike	05bf239d8e	Specify zeus setMedic module conditions further	2015-08-15 21:44:40 +01:00
SilentSpike	c01052e5bf	Update ace_zeus function headers	2015-08-15 21:11:49 +01:00
Glowbal	7fa30009d3	Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator	2015-08-15 20:39:54 +02:00
Glowbal	1417429782	Switched to serverInit instead of init as per suggestion from @SilentSpike	2015-08-15 20:39:22 +02:00
Glowbal	c7f47c0b34	Replaced check for captive module by check for ACE_medical	2015-08-15 20:31:41 +02:00
PabstMirror	d023139e8d	Stringtable fix	2015-08-15 12:04:57 -05:00
Glowbal	ed66255b19	Add objects to all curators	2015-08-15 18:39:43 +02:00
Glowbal	0e57d3d97c	Added assign medic, medicalfacility and medical vehicle curator modules	2015-08-15 18:25:48 +02:00
Michael Braun	1b488a17b5	Fixed typo that slipped into the code	2015-08-05 08:36:01 +02:00
Michael Braun	1b7f7534da	Small correction	2015-08-05 00:16:23 +02:00
Michael Braun	13b7e7ae72	Updated parameterization in Zeus module.	2015-08-05 00:10:54 +02:00
SilentSpike	e147138274	Update setUnconscious module with to be indefinite ... The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)	2015-07-31 17:32:13 +01:00
Harakhti	b2aa5eee45	Row 3 ... BINGO FUEL	2015-07-30 16:28:50 +02:00