176 Commits

Author	SHA1	Message	Date
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
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
Macusercom	500504d93b	Further improvements as suggested for German translation	2015-06-18 00:43:23 +02:00
Macusercom	cf2f36a775	Corrections suggested by others	2015-06-16 23:17:34 +02:00
Macusercom	24cea18ae5	Revert "Revert "Added German translations"" ... This reverts commit 4403e3c665.	2015-06-16 03:21:25 +02:00
Macusercom	4403e3c665	Revert "Added German translations" ... This reverts commit 0adc07d284.	2015-06-16 03:06:23 +02:00
Macusercom	0adc07d284	Added German translations	2015-06-16 03:06:13 +02:00
esteldunedain	d53ee1cf85	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into removeFrisk ... Conflicts: addons/captives/CfgVehicles.hpp	2015-06-13 15:19:52 -03:00
PabstMirror	fdb30f4e68	Merge pull request #1599 from acemod/captivesFixes ... Captives fixes	2015-06-13 13:15:29 -05:00
esteldunedain	3d5afd7d8f	Close #1018	2015-06-13 14:32:18 -03:00
PabstMirror	58e5bc3581	Switch unload captive to passenger actions	2015-06-13 00:02:30 -05: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
PabstMirror	84a12bcd56	Can't escort when mounted (passenger actions)	2015-06-10 22:44:54 -05:00
Ivan Navarro Cabello	d15bae105d	Updated spanish translation ... Updated spanish translation	2015-06-08 12:43:07 +02:00
ulteq	47d0d98680	Merge pull request #1537 from gienkov/pl-translation-2 ... captives and tripod PL translation	2015-06-08 00:34:56 +02:00
gienkov	ecf7873f33	captives and tripod PL translation	2015-06-07 18:55:49 +02:00
PabstMirror	32ce0aa6fd	Macroize all stringtables	2015-06-05 21:02:24 -05:00