346 Commits

Author	SHA1	Message	Date
commy2	5965326ca1	merge basic and adv. bandage actions	2016-10-13 09:47:52 +02:00
commy2	b1f0af7e1c	merge basic and adv. bandage actions	2016-10-13 09:10:08 +02:00
commy2	68d199c5b2	merge basic and adv. bandage actions	2016-10-13 02:05:14 +02:00
commy2	4a06d19ce4	merge basic and adv. bandage actions	2016-10-13 01:55:10 +02:00
commy2	92fc4ec14b	add a setting for 'basic' blood bags	2016-10-12 22:38:58 +02:00
commy2	a5d070f829	blood and unconsciousness fixes	2016-10-12 21:59:32 +02:00
commy2	3438ea0946	use liters for blood volume variable	2016-10-10 17:30:42 +02:00
commy2	4bc1c1db56	handle blood visuals	2016-10-07 04:21:01 +02:00
commy2	b698a88dc1	move modifyAction func to menu component	2016-10-07 01:58:40 +02:00
commy2	e9586ebccc	use common header file for medical components	2016-10-06 22:40:36 +02:00
commy2	5613ec5d5a	treatment functions and unconsciousness rework	2016-10-06 00:54:57 +02:00
commy2	feac296f9c	use a new macro	2016-10-02 13:06:47 +02:00
commy2	f185742e68	manual merge	2016-10-02 12:51:29 +02:00
commy2	490155270b	QEGVAR vs QGVAR	2016-09-30 12:18:59 +02:00
commy2	1196cbb210	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-09-30 10:39:06 +02:00
commy2	96a1e74c85	synch anim speed acceleration	2016-09-30 10:38:27 +02:00
PabstMirror	60a7490b7e	Fix some moved funcs/strings	2016-09-29 15:08:36 -05:00
commy2	03e24d8fd9	improve checkItems function	2016-09-29 21:32:54 +02:00
commy2	f53d324c0d	simplifications in the treatment config	2016-09-29 20:29:44 +02:00
commy2	20a544e549	remove debug mode	2016-09-29 19:45:03 +02:00
commy2	ef8ad21446	fix inconsistencies in treatment time between basic and adv, fix item usage	2016-09-29 19:43:50 +02:00
commy2	e418cc05e9	cleanup, fix headers treatment has/use item functions	2016-09-29 19:31:48 +02:00
commy2	d3f6f040cd	fix some problems with transitions from lowered weapon animations	2016-09-29 19:15:16 +02:00
commy2	2c7864c02b	implement custom treatment sounds	2016-09-29 18:45:18 +02:00
commy2	ecd77630f5	some more animation time tweaks	2016-09-29 18:12:51 +02:00
commy2	36d244a868	'modernize' primary treatment functions, fix animation issues, add anim speed scaling	2016-09-29 16:00:19 +02:00
commy2	410c5f1d5f	treatment debug	2016-09-28 20:46:46 +02:00
commy2	0decd72063	manual merge	2016-09-28 08:37:39 +02:00
commy2	7470d1f0f5	cleanup/improve parseConfigForinjuries	2016-09-27 11:05:38 +02:00
PabstMirror	39fa0b5d0e	#4366 - Fix treatment animion with no weapon equiped	2016-09-21 15:55:29 -05:00
commy2	8937a27b96	port litter settings to treatment, stringtable fixes	2016-09-19 18:20:56 +02:00
commy2	c2f8007d36	port litter settings to treatment	2016-09-19 18:05:49 +02:00
commy2	10d4047b4c	fix problems with ported treatment	2016-09-19 17:52:16 +02:00
commy2	158b1eed69	add server only event handler only on server machine	2016-09-19 10:05:16 +02:00
commy2	81d962f0d5	port litter to treatment	2016-09-19 09:55:30 +02:00
Glowbal	27314c34b1	fix treatment functionality	2016-09-18 22:58:56 +02:00
Glowbal	1c1e47c039	Enable treatmnet actions	2016-09-18 19:48:49 +02:00
Glowbal	811e1cd598	First set up clean up for medical rewrite	2016-09-18 12:05:36 +02:00
PabstMirror	f12feae7fe	Fix some efuncs	2016-08-09 12:47:59 -05:00
PabstMirror	011c6a0d00	Fix merge conficlts	2016-08-09 12:14:30 -05:00
PabstMirror	6c63d3c23a	Merge branch 'master' into medical-rewrite	2016-08-09 12:11:30 -05:00
Glowbal	131ef576b4	Add medical treatments and configuration	2016-07-15 12:23:47 +02:00
Glowbal	ab2075c328	Merge branch 'master' into medical-rewrite ... Conflicts: addons/medical/CfgEden.hpp addons/medical/functions/fnc_reviveStateLoop.sqf addons/medical/functions/fnc_serverRemoveBody.sqf addons/medical/functions/fnc_unconsciousPFH.sqf	2016-07-15 11:50:58 +02:00
Glowbal	3aa88c80bf	Add first step in medical rewrite ... Split up medical core and medical damage. Move out all other functionality	2016-06-30 17:33:29 +02:00
Glowbal	8c331937d0	Merge branch 'merge-basic-and-advanced' into medical-split-treatment ... Conflicts: addons/medical/ACE_Medical_Treatments.hpp addons/medical/config.cpp addons/medical_treatment/functions/fnc_addToTriageCard.sqf	2016-06-30 11:41:03 +02:00
Glowbal	a8831a0d16	Change split medical in two components ... - medical component is responsible for the injuries and common functionality - medical_treatment component is responsible for offering treatment functionality	2016-06-13 17:00:56 +02:00