66 Commits

Author	SHA1	Message	Date
jokoho48	daf2fc2669	remove ccp issue in settings ... prevent setCaptive if unit is wake up	2016-01-06 18:01:24 +01:00
jokoho48	6d49bbda28	add delay to Unconsciousness Captivity(posible fix for #3121)	2016-01-06 17:46:59 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
commy2	07774647e9	delay setUnconscious until the settings are inited, fix #148	2015-09-26 19:30:13 +02:00
jokoho48	19dd55147a	Code Cleanup Medical Module (Part 4).	2015-08-22 19:47:23 +02:00
PabstMirror	d4f70134e6	medical/setUnconscious header	2015-07-12 10:25:00 -05:00
AKALegman	5431ab5e01	fixed conflicts	2015-06-10 20:03:00 +01:00
AKALegman	1ae8e29ac2	updated isPlayer v2	2015-06-08 19:12:16 +01:00
AKALegman	96fccbedf9	updated isPlayer	2015-06-08 11:09:49 +01:00
AKALegman	d3eae58237	Fixed Zeus Unconscious	2015-06-07 12:17:52 +01:00
PabstMirror	84428e5e6c	Medical - unconsciousness: fix exitWith scope	2015-06-05 15:43:09 -05:00
jaynus	c924baefd7	All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.	2015-05-21 09:42:44 -07:00
Glowbal	429c85c9f1	fixed missing parameters for non local unit	2015-05-20 17:15:22 +02:00
Glowbal	913c938a9d	Added force unconscious parameter #1205	2015-05-20 17:15:21 +02:00
PabstMirror	bded34fa23	I suck at git ... redo reverted stuff here	2015-05-01 15:03:05 -05:00
KoffeinFlummi	67bd2b4e2f	Reduce animation forcing delay	2015-05-01 01:36:09 +02:00
KoffeinFlummi	98e44e86d8	Offload ejecting to unloadPerson	2015-05-01 01:35:50 +02:00
KoffeinFlummi	53835605ea	Merge remote-tracking branch 'origin/master' into basic-med-options ... Conflicts: addons/medical/functions/fnc_getBloodLoss.sqf addons/medical/functions/fnc_handleDamage_basic.sqf	2015-05-01 01:25:16 +02:00
KoffeinFlummi	d59436c588	Only force animation when necessary	2015-04-30 22:19:31 +02:00
KoffeinFlummi	8fda984903	Fix missing semicolon	2015-04-30 22:17:25 +02:00
KoffeinFlummi	965a976daf	Reorganize AI unconsciousness	2015-04-30 22:16:45 +02:00
KoffeinFlummi	f28a806938	Remove max unconsciousness time again	2015-04-30 22:15:40 +02:00
KoffeinFlummi	fd152c580b	Merge branch 'master' into basic-med-options ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/functions/fnc_setUnconscious.sqf	2015-04-30 18:39:33 +02:00
PabstMirror	eb5af0cd89	Medical Private Variables	2015-04-30 01:17:26 -05:00
commy2	8976b6983d	mute unconsious units	2015-04-26 16:47:36 +02:00
KoffeinFlummi	d7b961043b	Remove animation reset before falling unconscious ... This caused the unit to briefly move to the default animation, which looked shite.	2015-04-24 22:20:16 +02:00
KoffeinFlummi	d1c95ba8a1	Add maximum unconsciousness time option	2015-04-23 11:31:27 +02:00
Glowbal	1df42b17c2	close all dialogs	2015-04-20 22:22:09 +02:00
Glowbal	8be7ccaab7	setting for moving unit from group on unconscious	2015-04-20 21:37:30 +02:00
Glowbal	008c36ac76	fixes #699	2015-04-17 21:27:57 +02:00
Glowbal	31bc09a9a3	fixed AI standing up before being killed ... Doesn't matter if we enable AI again on dead units	2015-04-17 21:06:30 +02:00
Glowbal	80139521bc	fixes #691	2015-04-17 20:49:24 +02:00
Glowbal	847ee7e229	Moved unconscious event, so it won't conflict in case the unit is still being carried	2015-04-17 20:38:02 +02:00
Glowbal	8b7e46c45f	fixes #656	2015-04-17 20:26:28 +02:00
Glowbal	c86be12668	fixes #599	2015-04-17 20:24:05 +02:00
PabstMirror	bf3e3d3b64	#542 - ACE_fakeWeapon not found	2015-04-13 03:46:42 -05:00
PabstMirror	70dbae5a25	#527 - Unconscious switching groups	2015-04-13 00:32:07 -05:00
PabstMirror	adc7db9ae9	#456 - Fix AI rotating while dead (disableAI func) ... Still some small head movements, but I don't know how to fix that.	2015-04-10 15:02:40 -05:00
Glowbal	0926397ab4	Removed deadcode and obvious comments	2015-04-09 20:13:46 +02:00
Glowbal	2657677bd8	Added support for TFR/ACRE on unconscious	2015-04-06 14:09:59 +02:00
Glowbal	ddb01e7865	Improved unconscious wakeup animations	2015-04-04 20:21:06 +02:00
Glowbal	08e1949078	Improved patient unconscious animation	2015-04-04 18:08:41 +02:00
Glowbal	a6ce961ca1	Usage of isBeingCarried and isBeingDragged	2015-04-03 22:45:16 +02:00
Glowbal	b92978fb80	Now resets the proper hasMovedOut value	2015-04-03 20:11:20 +02:00
Glowbal	e68e487769	fixed units not moving out of unconscious animation	2015-04-03 20:07:39 +02:00
Glowbal	6f630d4c03	Changed setUnconscious contract to support a minimum unconscious time	2015-04-02 22:55:23 +02:00
PabstMirror	559f0dbaea	Unconc - dropping object handled in dragging	2015-03-26 16:32:44 -05:00
PabstMirror	3f137d357d	Medical - carryObj func moved	2015-03-26 15:05:50 -05:00