Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,206 Commits 73 Branches 88 Tags 752 MiB
59d0e6e788
Commit Graph

209 Commits

Author SHA1 Message Date
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
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