232 Commits

Author	SHA1	Message	Date
esteldunedain	71707bc81a	Some spanish translations for 3.5.0	2016-02-25 10:54:19 -03:00
jonpas	1402985133	Fix typos	2016-02-24 19:34:03 +01:00
jonpas	a3d769c410	Cleanup some module descriptions, close #2561	2016-02-24 19:22:16 +01:00
PabstMirror	7cf912222b	Merge pull request #3393 from acemod/3denReplaceDropDown ... Fix 3den attributes	2016-02-23 17:09:03 -06:00
commy2	c45523475f	manual merge	2016-02-22 16:06:30 +01:00
commy2	46a239f9f6	precompile on game start	2016-02-22 15:20:36 +01:00
PabstMirror	e6052aee1f	Fix captives 3den	2016-02-22 03:00:40 -06:00
commy2	f43e88ff25	replace zeusDisplayChanged with DisplayLoad event	2016-02-21 22:16:12 +01:00
commy2	5dcb8707dd	Merge pull request #3359 from gienkov/edenadditions ... integrate captivity modules with 3DEN	2016-02-21 12:44:39 +01:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
PabstMirror	b9cf5817b9	Restore delay in modules	2016-02-20 09:39:15 -06:00
esteldunedain	6523b715fe	Delay captivity until 0.05s after settings are initialized	2016-02-20 11:57:47 -03:00
gienkov	1b03ee76fd	tabs	2016-02-20 14:07:39 +01:00
gienkov	54b71cc7ba	integrate captivity modules with 3DEN	2016-02-20 13:36:53 +01:00
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
licht-im-Norden87	39e26b0f11	captives	2016-02-10 17:19:42 +01:00
ProfessorCZ	61611d0ec7	Czech Translation - Update ... Update	2016-02-03 18:31:31 +01:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	04bccf47d7	Replace all use of deprecated commands	2016-01-19 09:39:07 -06:00
Alessandro Foresi	c16d97cad0	Merge branch 'master' into translation/15bn/alef	2016-01-03 12:23:27 +01:00
bux	0e8eb5fac4	Remove obsolete hotkey entries	2015-12-30 11:23:52 +01:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -06:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	ca9b909e75	fix CBA_fnc capitalization	2015-11-30 16:45:20 +01:00
gienkov	b091b73e24	fixes	2015-11-27 21:54:04 +01:00
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +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	0b9044e3c7	Merge pull request #2753 from acemod/showHudSetter ... Showhud setter	2015-11-25 11:16:21 -06:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
kaban	da16fc1038	\addons\captives\stringtable.xml - resolving conflicts.	2015-11-18 06:50:00 +03:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
Jonathan Pereira	7ec480c98e	Added ace_captives translation to PT-BR	2015-11-07 11:39:02 -02:00
gienkov	0b6fcacaf0	pl translation	2015-11-06 00:56:15 +01:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
PabstMirror	1c26f6c9f5	Captives - Module to set handcuffing ... also add player check for GVAR(requireSurrender) in canApplyHandcuffes	2015-10-23 14:17:31 -05:00
PabstMirror	ef681e4332	Captives - Fix adding duplicate animEH	2015-10-23 13:11:11 -05:00
bux578	602832cc0c	adjust german translations	2015-10-19 07:29:02 +02:00
bux578	f7b717db64	Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11	2015-10-19 07:23:51 +02:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
PabstMirror	94e3cd1f79	Replace old use of showHud	2015-10-15 22:45:35 -05:00
licht-im-Norden87	66e8914360	Update stringtable.xml	2015-10-01 04:38:21 +02:00
licht-im-Norden87	88ee846d7d	Update Stringtable, german: "captives"	2015-10-01 01:36:27 +02:00
PabstMirror	d454271fb9	Give the event the D	2015-09-29 11:40:32 -05:00
PabstMirror	16b1244b0a	Global Event for "CaptiveStatusChange"	2015-09-29 10:17:17 -05:00
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
PabstMirror	bf0cdbaf77	Merge pull request #2534 from acemod/unconcHandcuffs ... Take Unconscious captive	2015-09-21 20:35:02 -05:00