102 Commits

Author	SHA1	Message	Date
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
Harakhti	2b23958fd1	Row 2 ... It gets tedious after a while, especially if your language lacks technical terms. That or my B2 language exam isn't good enough.	2015-07-30 16:06:32 +02:00
SilentSpike	67e5e31394	Change zeus modules to run globally ... Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.	2015-07-29 12:25:04 +01:00
Glowbal	41196c15aa	Merge pull request #1686 from acemod/fixFrag ... Fix frag	2015-07-26 23:42:16 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02:00
PabstMirror	e29fb477f9	Merge branch 'master' into fixFrag	2015-07-25 02:38:10 -05:00
SilentSpike	186d4d0583	Fix for #1665	2015-07-20 21:14:30 +01:00
ToasterBR	f4a51d57ef	Translation to Brazilian Portuguese (PT-BR) ... Made all remaining translations, including new ones like the sitting module, for example.	2015-06-27 15:48:39 -03:00
SilentSpike	27a4ecd747	Expanded readme	2015-06-22 00:43:39 +01:00
SilentSpike	378b39db77	Merge remote-tracking branch 'upstream/master'	2015-06-22 00:37:28 +01:00
SilentSpike	398f1c768f	Fix the module on dedicated servers	2015-06-22 00:17:29 +01:00
SilentSpike	e3e415c727	Added readme	2015-06-21 23:46:23 +01:00
PabstMirror	6c7ba7b5ae	Zeus module on dedicated server	2015-06-18 22:43:49 -05:00
PabstMirror	375c81d9b0	Connect Zeus module to Frag	2015-06-18 22:13:06 -05:00
Macusercom	ed4fbb5d33	More corrections	2015-06-16 23:19:47 +02:00
Macusercom	09f7473d7b	Added German translations	2015-06-16 03:06:47 +02:00
ProfessorCZ	acc5f4d29f	CZ - Translation	2015-06-12 15:05:04 +02:00
ProfessorCZ	531372b2a3	CZ - Translation ... Already in README	2015-06-12 14:50:50 +02:00
Nicolás Badano	1def1ee7e4	Merge pull request #1546 from SilentSpike/zeusUpdate ... Update ace_zeus with 1.46 changes	2015-06-08 14:44:12 -03:00
SilentSpike	f9d1a39adf	Updated edited BI functions with 1.46 changes	2015-06-08 18:18:40 +01:00
Ivan Navarro Cabello	d15bae105d	Updated spanish translation ... Updated spanish translation	2015-06-08 12:43:07 +02:00
gienkov	c1a7374404	Merge remote-tracking branch 'upstream/master' into pl-translation-1 ... Conflicts: addons/interact_menu/stringtable.xml	2015-06-05 09:40:50 +02:00
SilentSpike	2b79838555	Use existing disabled string	2015-06-04 19:40:11 +01:00
SilentSpike	94a6eefa32	using new string macros	2015-06-04 19:33:19 +01:00