193 Commits

Author	SHA1	Message	Date
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
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
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
PabstMirror	db41537f56	#2524 - Take Unconscious captive	2015-09-19 13:58:34 -05:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
PabstMirror	17fdce7196	Cleanup preInit	2015-09-15 08:03:56 -05:00
SilentSpike	7c846502b5	Reset captive status on respawn for reliability ... Previously we were resetting on death, but this caused problems when the respawnDelay was 0 as the dead unit wasn't actually the player. To account for "group" and "side" respawn types where you change unit on respawn and could potentially become a captive unit, I am explicity checking the mission respawn type before resetting variables.	2015-09-12 15:42:20 +01: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	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
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
commy2	acfc48efc2	animate head when surrendered and handcuffed	2015-09-01 20:00:28 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
PabstMirror	d3db5ad2ed	Cleanup	2015-08-24 00:07:40 -05:00
PabstMirror	40634318f0	Move RemoveHandcuffs to Main (always blocked by hands)	2015-08-23 23:41:35 -05:00
PabstMirror	8ca06a9a76	More FFV animation stuff	2015-08-23 12:32:46 -05:00
PabstMirror	b5fb0daa9b	Merge branch 'master' into captiveFFV	2015-08-23 10:46:49 -05:00
PabstMirror	69df301e67	Replace one more macro	2015-08-23 02:29:51 -05:00
PabstMirror	51a8cb7974	Only force Animation for FFV Cargo Seats	2015-08-20 23:58:06 -05:00
PabstMirror	645e8a63ef	Captive FFV Lock Animation	2015-08-20 04:20:46 -05:00
jonpas	683e727cb4	Readded items	2015-08-19 04:22:39 +02:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
bux578	ec29890780	Merge pull request #2128 from acemod/gienkov-pl-translation-5 ... Gienkov pl translation 5	2015-08-16 08:54:47 +02:00
PabstMirror	c35fc35eb3	Captive FFV stuff	2015-08-14 21:29:01 -05:00
PabstMirror	3425913d27	#2132 - Don't use depreciated Helicopter_F	2015-08-12 23:32:57 -05:00
gienkov	1c537c6739	fix captives again	2015-08-09 23:04:16 +02:00
gienkov	0914193e14	fix captives module	2015-08-09 22:45:01 +02:00
gienkov	be787883f2	captives translation	2015-08-09 22:38:34 +02:00
Glowbal	c7ac190f58	Finalized settings	2015-08-09 00:21:59 +02:00
Glowbal	27ec3adeac	Added stringtable entries requireSurrender setting	2015-08-07 14:51:56 +02:00
Glowbal	997ac53c11	Added isSurrendering check	2015-08-07 14:49:01 +02:00
Glowbal	4c935bb504	Added setting for require surrender	2015-08-07 14:46:28 +02:00
PabstMirror	016f45f0e8	fix speling	2015-08-06 15:41:24 -05:00
jokoho48	24dd320c3c	Updated parameterization in Captives module.	2015-08-05 01:15:20 +02:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
KoffeinFlummi	9805a8270a	Merge branch 'master' into german-merge	2015-07-25 19:35:03 +02:00