Commit Graph

61 Commits

Author SHA1 Message Date
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
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
ffcc01ef74 Removed rouge systemChat message on unconsciousness #292 2015-04-03 08:45:02 +02:00
PabstMirror
7c121e6a80 Missing, unused stringtable 2015-04-02 22:32:16 -05:00
PabstMirror
14cbceef97 Rerun set func when respawn into captive unit 2015-03-26 14:21:26 -05:00
PabstMirror
d4d0a0a6de Make sure to remove animEH 2015-03-26 00:53:38 -05:00
PabstMirror
811530f180 Ensure captiveNum is reset for respawning unit 2015-03-26 00:53:02 -05:00
PabstMirror
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
PabstMirror
3f32627d61 Implement Unconc Event Handler 2015-03-10 11:08:15 -05:00
PabstMirror
80ac6d83de Zeus Module Messages 2015-02-24 12:44:54 -06:00
PabstMirror
ae3de331c4 Module At Mission Start (Issue #148) 2015-02-24 11:51:37 -06:00
PabstMirror
233647a144 Merge branch 'master' into fixSurrendering 2015-02-24 11:37:28 -06:00
PabstMirror
5364980997 Zeus Module Hints 2015-02-24 11:36:49 -06:00
PabstMirror
85c568a061 Comments 2015-02-24 10:27:53 -06:00
PabstMirror
a8e269bc18 Cleanup Escort Logic
No more ERROR spam
2015-02-19 14:34:14 -06:00
PabstMirror
37216d5144 Remove HandCuff animEH 2015-02-17 17:05:07 -06:00
PabstMirror
9cdf06383d Back to getIn 2015-02-16 19:20:55 -06:00
PabstMirror
dc82e50d72 fix 2015-02-16 18:30:35 -06:00
PabstMirror
eee4b256cd More Changes and add EH 2015-02-16 18:03:09 -06:00
PabstMirror
e0d1d08913 Change AnimChange EH 2015-02-15 18:19:01 -06:00
PabstMirror
a0c2a00777 Cleanup 2015-02-15 16:45:13 -06:00
PabstMirror
3c65c422b1 More Surrender Fixes
Increase "drop hands" animation speed (now just 1/2 of normal)
Use "AnimChanged" EH to watch for animation breaks while surrendering
Only "crack" the hands up animation if we are in the right animation
state
2015-02-15 16:42:00 -06:00
PabstMirror
dec34b4b30 Surrender Fixes
Remove XEH GetIn and use vehicleChanged Event
Handle Zeus (showHUD)
Attempt to handle failed animation change
2015-02-15 14:55:17 -06:00
PabstMirror
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
PabstMirror
fcf39a3916 #118 Sound Effect from CSE 2015-02-06 23:23:33 -06:00
PabstMirror
ed3f28ec6d Minor Cleanup 2015-02-06 22:24:27 -06:00
PabstMirror
c117e9bf16 Header Examples 2015-02-06 17:03:56 -06:00