BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
PabstMirror
7cf912222b
Merge pull request #3393 from acemod/3denReplaceDropDown
...
Fix 3den attributes
2016-02-23 17:09:03 -06: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
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
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -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
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01: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
PabstMirror
94e3cd1f79
Replace old use of showHud
2015-10-15 22:45:35 -05: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
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
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
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
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
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
Glowbal
c7ac190f58
Finalized settings
2015-08-09 00:21:59 +02:00
Glowbal
997ac53c11
Added isSurrendering check
2015-08-07 14:49:01 +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
PabstMirror
58e5bc3581
Switch unload captive to passenger actions
2015-06-13 00:02:30 -05:00
PabstMirror
84a12bcd56
Can't escort when mounted (passenger actions)
2015-06-10 22:44:54 -05:00
PabstMirror
e5edc0345b
Merge branch 'master' into captiveModuleSettings
...
Conflicts:
addons/captives/CfgVehicles.hpp
2015-06-04 13:15:53 -05:00
PabstMirror
5dc94487c5
Module Settings for Captivity
...
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -05:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
SilentSpike
eefe995a0c
Transfer curator functionality from ace_captives
2015-06-01 20:44:50 +01:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
c4e5e9a7ac
#1298 - Reset handcuffs on respawn
2015-05-18 22:02:50 -05:00
PabstMirror
59adf92862
Fix not being able to UnSurrender (currentWeapon)
2015-05-10 01:47:50 -05:00
PabstMirror
ca980379c8
Minor captive cleanup
2015-04-25 16:03:21 -05:00
PabstMirror
638433614c
Some missing private defines.
2015-04-16 12:36:16 -05:00
PabstMirror
e84689a771
#544 - Change ERROR warning to debug trace
2015-04-15 11:46:06 -05:00
PabstMirror
7111cdd8ff
#540 - remove debug spam
2015-04-13 03:16:33 -05:00
esteldunedain
91df52056b
Only display "Surrender" action if the player is not holding a weapon.
2015-04-12 11:13:54 -03:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
