1976 Commits

Author	SHA1	Message	Date
PabstMirror	2e47bad280	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-03-02 18:01:40 -06:00
PabstMirror	8ad3571d19	Merge branch 'master' into medical-rewrite	2017-03-02 18:00:34 -06:00
sbng-PAPA	e2c04a80c4	More accurate Korean translate for medical (#4897)	2017-03-02 17:48:48 -06:00
Dedmen Miller	512592b79d	Prevent starting additional vital loops on full heal (#4885)	2017-03-02 17:22:16 -06:00
PabstMirror	97ec22bd9a	Switch heartbeat to waitAndExec, allow switching pain settings	2017-02-18 22:11:40 -06:00
PabstMirror	34f87f89bb	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-02-18 18:24:03 -06:00
PabstMirror	c7b60d1777	Merge branch 'master' into medical-rewrite	2017-02-18 18:17:37 -06:00
Mark Ruffner	0900bf964b	Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) ... * Update medical/repair 3den away from missionNamespace * Simplify save	2017-02-18 12:27:36 -06:00
NorXAengell	1be278fbda	French translation to "Advanced throwing" and "Advanced fatigue" (#4415) ... * French translation of "Advanced fatigue" and "Advanced throwing" Full translation of "Advanced fatigue" and "Advanced throwing". * New batch of translation/correction	2017-02-11 15:16:56 -06:00
jonpas	b2986cea8a	Merge branch 'master' into armake	2017-02-07 03:51:29 +01:00
commy2	9d68fbf987	fix script error caused by new arguments passed to handleDamage (#4866) ... * fix script error caused by new arguments passed to handleDamage * Copy array to not break other handleDamage ehs * Resize to 7	2017-02-02 13:03:13 -06:00
BaerMitUmlaut	0c6eec8485	Merge branch 'medical-rewrite' into medical-rewrite-effects	2017-01-30 21:34:51 +01:00
BaerMitUmlaut	60c57a7f20	Fix unconscious state in cardiac arrest	2017-01-30 21:22:10 +01:00
BaerMitUmlaut	20cf30a7c6	Moved heart beat sounds to medical ui	2017-01-29 21:59:24 +01:00
BaerMitUmlaut	9eba2bd448	Added visual effects	2017-01-29 21:59:24 +01:00
ViperMaul	ba810a22e6	Tab clean up.	2017-01-19 18:38:51 -06:00
ViperMaul	567c9129b2	cleanup	2017-01-19 17:23:54 -06:00
ViperMaul	59c58b1269	Add settings function handler	2017-01-19 17:19:54 -06:00
ViperMaul	8db5d8f2ae	Change Setting from Basic to Normal and Stringtable moves	2017-01-19 15:46:44 -06:00
ViperMaul	6972af9d0b	Settings and string changes	2017-01-19 15:30:27 -06:00
ViperMaul	1078913d2a	Stringtable changes.	2017-01-19 15:29:33 -06:00
ViperMaul	69dc3ba12e	Add Settings to Medical Settings Module	2017-01-19 11:48:34 -06:00
jonpas	3ac00f2e21	Fix medical typo 'to' -> 'too' (#4824)	2017-01-17 15:26:07 -06:00
PabstMirror	a32478adfb	Merge branch 'master' into medical-rewrite	2017-01-17 13:10:18 -06:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
ulteq	1e79f35e43	Always visualize bandaged wounds ... * Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled	2016-12-15 15:01:02 +01:00
ulteq	0ddfd5eb16	Disable wound reopening when advanced bandages are disabled	2016-12-15 14:51:24 +01:00
ulteq	70a2dc30e7	Refactored 'showPainInMenu' setting ... * showPainInMenu -> on/off switch * medicSetting_PainVisualization -> 3 way switch on who can see it	2016-12-15 14:45:58 +01:00
ulteq	91cbc0e4d4	Added new setting 'advancedDiagnose' ... * Which allows to choose between the old basic- and advanced diagnose actions	2016-12-15 14:00:09 +01:00
ulteq	0de405fe2a	Fix morphine when advanced medication is disabled	2016-12-15 12:58:06 +01:00
ulteq	65f0f56474	Implemented 'showPainInMenu'	2016-12-14 21:30:28 +01:00
ulteq	8146cb427e	Revert "Implemented 'showPainInMenu' logic" ... This reverts commit 964711a38b.	2016-12-14 21:23:26 +01:00
ulteq	964711a38b	Implemented 'showPainInMenu' logic	2016-12-14 20:55:03 +01:00
ulteq	196a3999a4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-14 20:44:22 +01:00
ulteq	151d4a4bfe	Settings overhaul ... New settings: * allowSelfIV * showPainInMenu Converted CBA -> ACE Settings: * advancedBandages * advancedMedication * fatalInjuryCondition * cardiacArrestTime Fixed settings: * useLocation_Epi * medicSetting_Epi * painCoefficient	2016-12-14 20:44:06 +01:00
PabstMirror	af4b3e31e1	Minor iv optimization	2016-12-14 11:50:31 -06:00
ulteq	a2b964a993	Fixed bandage config lookup	2016-12-14 18:04:56 +01:00
ulteq	5d3f97ace7	Fix IV Bags work on limbs with a tourniquet applied	2016-12-14 12:36:51 +01:00
ulteq	852f78b801	Classify the perceived pain intensity on all patient information outputs ... Fixes: #2117	2016-12-10 15:24:20 +01:00
PabstMirror	a451ad356e	Close patient display when interaction menu closes	2016-12-09 21:35:26 -06:00
PabstMirror	3907d2dc9f	Cleanup moved functions	2016-12-09 21:27:42 -06:00
PabstMirror	b87bdfe14a	Fix body-bag action / cleanup	2016-12-09 21:03:52 -06:00
PabstMirror	ee864b2c46	Fix medkit string, fix overpressure	2016-12-09 13:48:54 -06:00
ulteq	05b9208d3c	Change debug	2016-12-09 18:43:32 +01:00
ulteq	03f9ba1bad	Improved simulation of tourniquet pain: ... * Made use of the new pain level helper function	2016-12-09 17:48:27 +01:00
ulteq	ada43148e9	Removed deprecated revive settings	2016-12-09 17:07:05 +01:00
ulteq	bfda932384	Different max. bleeding rates for different body parts	2016-12-09 15:54:33 +01:00
ulteq	a809047ac4	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-12-09 12:57:42 +01:00
ulteq	82e88061fc	Added 'DEFAULT_HEART_RATE' constant	2016-12-09 12:57:27 +01:00
PabstMirror	cc6150303f	Add setting for blood bag flow rate (#4751)	2016-12-09 11:33:01 +01:00
ulteq	c486f17539	Implemented Medkit (works like in ACE2)	2016-12-08 18:11:24 +01:00
BaerMitUmlaut	a48d271368	Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits ... Introduce small variation to length of cardiac arrest	2016-12-08 14:22:11 +01:00
ulteq	3b82510751	Merge new wounds into existing wounds whenever possible ... * Todo: separate 'amountOf' into two variables (wound count and bandage percentage)	2016-12-08 12:59:30 +01:00
ulteq	78bfc0c26d	Simplified damage storage	2016-12-08 11:38:43 +01:00
ulteq	627ea0ebdc	Dynamically translate different wound types ... * Brings back minor, medium, large wounds	2016-12-07 21:56:13 +01:00
ulteq	89c68364ef	Fix pain suppression not affecting 'setCustomAimCoef'	2016-12-07 19:51:28 +01:00
ulteq	66803a4b4d	Fix damage coloring	2016-12-07 18:53:04 +01:00
ulteq	74fefb6f69	New body part colors: ... * Red bleeding * Blue tourniquet * Yellow/Orange damage	2016-12-07 18:28:35 +01:00
ulteq	7f1678b7e6	Increased wake up chance	2016-12-07 18:19:35 +01:00
ulteq	03f7451c99	Fixed incorrect debug output	2016-12-07 11:41:58 +01:00
ulteq	5db75ac746	Fixed check blood pressure did not always account for tourniquets	2016-12-07 11:32:01 +01:00
ulteq	ab7af04530	Overhauled the medication system: ... * Refactored the old code * Introduced 'timeTillMaxEffect' config entry for medication	2016-12-06 20:42:10 +01:00
ulteq	02ac4c4084	Fixed minor bug in the heart rate calculation	2016-12-06 17:40:05 +01:00
ulteq	faa2b619ab	Removed overly verbose debug logs	2016-12-06 17:35:52 +01:00
ulteq	fa77fb7194	Various fixes: ... * Fixed medication (morphine, epinephrine, ...) * Fixed CPR * Improved heart rate simulation * Removed deprecated ace settings	2016-12-06 17:26:11 +01:00
ulteq	978a81fb0a	Removed dead code	2016-12-06 14:37:48 +01:00
ulteq	92da5c80a0	Partly fixed Medication ... * Brings the heart rate adjustment (due to medication) back to life * Restores the medication effect loop (needs testing)	2016-12-06 12:58:12 +01:00
ulteq	db547a53b7	Increased unconsciousness wake up interval	2016-12-06 10:58:43 +01:00
PabstMirror	c47772eddc	Fix stringtables	2016-12-05 19:40:26 -06:00
ulteq	a88be4f458	Fixed 'displayPatientInformation'	2016-12-05 23:00:02 +01:00
ulteq	a5ce5b4a34	Medical Rewrite - Continued (#4744)	2016-12-05 21:34:20 +01:00
commy2	9cba0baade	manual merge	2016-12-05 20:18:15 +01:00
commy2	a83267b2ff	manual merge	2016-12-05 20:15:16 +01:00
BaerMitUmlaut	ac28bce578	Fixed state machine not running for units	2016-11-29 12:35:26 +01:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699)	2016-11-23 13:35:25 -06:00
SilentSpike	39582914f7	Add 10% variation to cardiac arrest time ... Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.	2016-11-15 17:00:22 +00:00
SilentSpike	24ada4dab3	Clarify the maximumCardiacArrestTime setting	2016-11-13 21:45:38 +00:00
SilentSpike	27728172ed	Clarify the allowDeathMode setting	2016-11-13 21:27:40 +00:00
BaerMitUmlaut	b4569f0a96	Fix bracket	2016-11-13 18:11:18 +01:00
BaerMitUmlaut	27916e8455	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-11-13 18:03:12 +01:00
PabstMirror	5463e9dff8	Merge branch 'master' into medical-rewrite	2016-11-09 13:12:42 -06:00
Karan Singh	09b89a0bbc	Fix typo in Eden Options (#4615) ... * Fix typo in Eden Options This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp * Fix L13	2016-11-09 13:07:29 -06:00
BaerMitUmlaut	dac4a4dc42	Merged instant death and execution into one setting	2016-11-09 19:01:55 +01:00
BaerMitUmlaut	08a378bb2d	Added execution system, improved instant death	2016-11-08 19:37:56 +01:00
BaerMitUmlaut	928ded0e66	Fixed instant death and PREP	2016-11-07 23:46:10 +01:00
BaerMitUmlaut	ba9fc9240c	Removed traces of old state machine	2016-11-07 23:44:33 +01:00
BaerMitUmlaut	0427814961	Started transition to CBA state machine, removed revive in favour of extended cardiac arrest	2016-11-07 22:21:07 +01:00
BaerMitUmlaut	a65f1d19fa	Added state machine debug functionality	2016-11-07 22:19:55 +01:00
commy2	fc39ac14b7	don't knock out if pain is removed	2016-10-20 13:49:52 +02:00
commy2	be56b4d806	knock out due to pain	2016-10-20 13:46:28 +02:00
commy2	370faf9b48	cleanup	2016-10-20 13:38:26 +02:00
commy2	7e498ab762	setting for basic/advanced syringes	2016-10-20 02:14:11 +02:00
commy2	f2dfc6dc0e	fixes, tweaks	2016-10-13 20:17:21 +02:00
commy2	bc4c1787f9	show tourniquets in 3d menu	2016-10-13 19:05:29 +02:00
commy2	fe2c6e8d85	basic <-> advanced	2016-10-13 17:14:43 +02:00
commy2	68d75beae6	manual merge	2016-10-13 16:56:57 +02:00
commy2	e1cbeeea16	fix tourniquets	2016-10-13 10:12:28 +02:00
commy2	18907adcd5	increase medical item mass to at least 100 grams	2016-10-13 09:48:58 +02:00
commy2	b1f0af7e1c	merge basic and adv. bandage actions	2016-10-13 09:10:08 +02:00
commy2	e38845bf45	add ace_kill event handler	2016-10-12 23:20:22 +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	be71e6fa7b	Merge branch 'medical-rewrite-blood' into medical-rewrite	2016-10-12 04:05:50 +02:00
commy2	b0b9037f24	simplify lost some/much blood macros	2016-10-11 19:44:20 +02:00
commy2	d1df47919d	support neg numbers to remove pain in addPain	2016-10-11 19:36:04 +02:00
commy2	1ea2a72f20	don't play scream by addPain function	2016-10-11 19:29:44 +02:00
commy2	d0df141cf7	add comment explaining why 6.0 were chosen	2016-10-10 18:22:46 +02:00
commy2	e2d174837a	move IV transufsion rate macro to blood config	2016-10-10 18:20:58 +02:00
commy2	c2f7366d32	blood volume unit vitals	2016-10-10 17:46:17 +02:00
commy2	3438ea0946	use liters for blood volume variable	2016-10-10 17:30:42 +02:00
commy2	fc079abd46	function header	2016-10-10 16:53:25 +02:00
commy2	2ad7c4c4ea	add addPain function, cap pain	2016-10-10 16:44:03 +02:00
commy2	4bc1c1db56	handle blood visuals	2016-10-07 04:21:01 +02:00
commy2	d4dd1626a5	delete some unused/moved functions from medical main component	2016-10-07 00:19:51 +02:00
commy2	50eeebd30d	add weapon sway by pain	2016-10-07 00:09:58 +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	56882a9bcb	manual merge	2016-10-02 13:04:20 +02:00
commy2	f4d4c521d7	manual merge	2016-10-02 13:02:17 +02:00
commy2	05d30c5573	convert log macros to cba versions (#4282) ... * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
commy2	f185742e68	manual merge	2016-10-02 12:51:29 +02:00
PabstMirror	1bc5669c95	Merge branch 'master' into cba-log-macros	2016-09-30 11:18:58 -05:00
commy2	c93e9e3f3b	fix playSoundInjured wrong args	2016-09-30 13:03:43 +02:00
PabstMirror	60a7490b7e	Fix some moved funcs/strings	2016-09-29 15:08:36 -05:00
commy2	2c7864c02b	implement custom treatment sounds	2016-09-29 18:45:18 +02:00
commy2	0decd72063	manual merge	2016-09-28 08:37:39 +02:00
commy2	20d00d7cd9	make units scream when they're hit	2016-09-27 21:21:44 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
commy2	a913054b57	fix error with out of bounds blood loss	2016-09-27 20:00:58 +02:00
classicarma	eaf00c8340	translate medical	2016-09-28 01:15:38 +09:00
commy2	5e35204811	woundHandler(SQF), fixes, improvements, more consistent variable naming	2016-09-27 17:29:49 +02:00
commy2	7470d1f0f5	cleanup/improve parseConfigForinjuries	2016-09-27 11:05:38 +02:00
commy2	9f6baca424	port injury parse fnc to medical damage	2016-09-26 20:25:14 +02:00
PabstMirror	3c53a314d4	Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros	2016-09-22 15:10:30 -05:00
commy2	236d1f9669	Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite	2016-09-19 18:23:37 +02:00
commy2	729ba9178b	Merge remote-tracking branch 'origin/master' into medical-rewrite	2016-09-19 18:23:26 +02:00
commy2	c2f8007d36	port litter settings to treatment	2016-09-19 18:05:49 +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
Grzegorz	a63dcb49d0	PL Translation 3.7.1 (#4395) ... * translate advanced fatigue * translate advanced throwing * translate cargo * translate chemlights * translate cookoff * translate explosives * translate fastroping * translate gforce * translate googles * translate grenades * translate gunbag * translate maptools * translate medical * translate medical_ai * translate minedetector * translate nametags * translate overheating * translate repair * translate tagging * translate ui * translate zeus	2016-09-18 22:00:13 +02:00
Glowbal	b74245c323	Merged branch medical-rewrite into medical-rewrite	2016-09-18 19:48:58 +02:00
Glowbal	1c1e47c039	Enable treatmnet actions	2016-09-18 19:48:49 +02:00
commy2	031bb1ec91	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-09-18 15:17:01 +02:00
commy2	a5dcdf102f	use TRACE macros for parseConfig function	2016-09-18 14:17:18 +02:00
Glowbal	9263cb0f7d	Fix handleDamage not working	2016-09-18 14:05:05 +02:00
Glowbal	7691af47f3	Further clean up	2016-09-18 13:33:22 +02:00
Glowbal	811e1cd598	First set up clean up for medical rewrite	2016-09-18 12:05:36 +02:00
Glowbal	0c43c83b3d	Merge branch 'master' ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionLoadUnit.sqf addons/medical/functions/fnc_addDamageToUnit.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_displayPatientInformation.sqf addons/medical/functions/fnc_handleCreateLitter.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_isBeingCarried.sqf addons/medical/functions/fnc_isBeingDragged.sqf addons/medical/functions/fnc_litterCleanupLoop.sqf addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf addons/medical/functions/fnc_setCardiacArrest.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf	2016-09-18 11:51:21 +02:00
PabstMirror	1caea46d60	Medical - Fix adv wound not stacking (#4353)	2016-09-07 20:54:54 +02:00
Glowbal	89a5f28772	Merge pull request #4192 from acemod/medical-rewrite-engine-component ... merge medical engine component into medical rewrite branch	2016-09-05 22:31:37 +02:00
PabstMirror	4fd5d6be6c	Fix handleDamage params for addDamageToUnit (#4344)	2016-09-05 22:27:00 +02:00
Glowbal	b489750d5b	Minor optimizations using private, params, and isEqualType (#4323) ... * Optimizations with private, params, and isEqualType * Fixed tab being used instead of space * Fixed tabs inserted by notepad++ * More usage of new private syntax and params - changed a few checks for an array being empty to `_arr isEqualTo []` rather than `count _arr == 0` - added more uses of `private` on the same line as the variable is declared - added more uses of params to assign variables passed as parameters - removed unnecessary parentheses - removed several unnecessary variable declarations with private array syntax * clean up and formatting	2016-09-04 16:44:22 +02:00
PabstMirror	1c5761f845	Bundle fire damage into larger chunks (#4223)	2016-09-03 22:00:45 +02:00
PabstMirror	c4d2383005	Increase blood bag flow rate for basic medical (#4306) ... * Change blood bags - Increase flow rate for basic medical - Don't queue bags * change to ivBags, reset var on init / fullHeal	2016-09-01 12:46:08 +02:00
commy2	2ac52fb430	remove static fix from vmedical component	2016-08-27 08:50:55 +02:00
Joko	927d8ead8f	add Hiddenselection camo to bodybag for Retexturing (#4276) ... * add Hiddenselection camo to bodybag * Add default texture * Use macro	2016-08-24 12:42:32 -05:00
commy2	f76457f48f	convert log macros to cba versions	2016-08-22 21:06:52 +02:00
Glowbal	83e78f1021	Merge pull request #4258 from acemod/reviveTimer ... Clear reviveState when calling setUnconscious	2016-08-20 11:57:51 +02:00
Glowbal	167dc7735d	Merge pull request #4197 from acemod/litterSimpleObject ... Use createSimpleObject for medical litter	2016-08-20 11:53:43 +02:00
PabstMirror	b02e91e02e	Clear reviveState when calling setUnconscious ... #4250	2016-08-18 01:59:40 -05:00
[OMCB]kaban	8fc2cbd0ef	Russian Translations - Update (#4217)	2016-08-13 11:25:43 +02:00
PabstMirror	f12feae7fe	Fix some efuncs	2016-08-09 12:47:59 -05:00
PabstMirror	6c63d3c23a	Merge branch 'master' into medical-rewrite	2016-08-09 12:11:30 -05:00
PabstMirror	c46b2d09cf	Heal hitpoint after bandage sets bodyPartStatus	2016-08-07 13:58:09 -05:00
PabstMirror	82cf18575c	Minor tweaks to medical ... - decrease needed blood loss on selection to turn icon red. (Largest wound bleedingRate is only 0.1) - Don't print warning for basic medical bandage not having sub configs	2016-08-03 13:14:12 -05:00
PabstMirror	02c308e141	Use createSimpleObject for medical litter	2016-08-01 16:20:13 -05:00
commy2	8a8bc6a336	remove hitpoint config from medical-main component	2016-07-30 17:23:08 +02:00
Ozan Eğitmen	8f80cd59c8	Use GVAR where applicable	2016-07-20 07:15:18 +03:00
Glowbal	ddb4ef42f3	Add stringtables and items	2016-07-15 12:21:56 +02:00
Glowbal	e4c36d9fa0	Change injuries include to ACE_Medical_Injuries	2016-07-15 12:10:18 +02:00
Glowbal	565da090bc	Add missing bracket	2016-07-15 11:53:57 +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	c8a54fd090	Merge branch 'release'	2016-07-15 02:03:42 +02:00
PabstMirror	1213c08e4b	Fix cached call events	2016-07-14 13:06:45 -05:00
PabstMirror	0281bc8f3d	Fix 3den attribute layout for 1.62	2016-07-12 17:54:16 +02:00
Glowbal	ee8e03a1ae	Merge pull request #3916 from acemod/merge-basic-and-advanced ... Merge basic and advanced injury systems	2016-07-12 13:36:02 +02:00
Glowbal	0e740f00c3	Merge branch 'release'	2016-07-11 23:42:03 +02:00
Glowbal	d0c30577af	Remove usage of setUnconscious	2016-07-11 19:18:40 +02:00
jonpas	fd39ee9e6b	Merge branch 'master' into armake	2016-07-11 16:27:37 +02:00
Glowbal	f86d8d113c	Merge branch 'release'	2016-07-09 11:36:49 +02:00
Glowbal	da661afe9b	Improve syntax	2016-07-07 17:22:08 +02:00
Glowbal	7157fcf420	Clean up unconscious and revive states	2016-07-07 12:57:21 +02:00
Glowbal	2daee60d0c	Add handle revive and Unconscious states	2016-07-07 12:04:26 +02:00
Glowbal	d0236a007a	Work done on medical states	2016-07-07 11:46:55 +02:00
PabstMirror	450b8dfedb	Fix order of revive loop ... Fix #4035 Revive loop was killing heartrate before it exited	2016-07-06 00:54:51 -05:00
Glowbal	e8eb729e04	Merge medical core and medical state. Add working version of the state machine, re-add sounds	2016-07-02 16:34:28 +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	e3f96b6594	Merge branch 'master' into merge-basic-and-advanced ... Conflicts: addons/medical/XEH_postInit.sqf addons/medical/functions/fnc_displayPatientInformation.sqf	2016-06-30 11:27:51 +02:00
Glowbal	cd08e00c71	Merge pull request #3962 from acemod/dogtags ... Dogtags	2016-06-29 22:19:02 +02:00
jonpas	b99b11d066	Merge branch 'master' into armake	2016-06-28 18:29:51 +02:00
Glowbal	1d66d46501	Fix damaged array not being overwritten. ... This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.	2016-06-27 19:55:00 +02:00
Glowbal	a9f3c2f784	Merge pull request #4012 from acemod/fix-medical-config-typo ... Fix incorrect values for bandage configuration	2016-06-27 19:07:34 +02:00
Glowbal	c287223a08	Fix incorrect values for bandage configuration	2016-06-27 19:01:33 +02:00
PabstMirror	10a19b59e7	Swich EFUNC(common,waitAndExecute) to CBA	2016-06-26 22:18:53 -05:00
Glowbal	b84b532cfb	Merge pull request #4001 from acemod/renameEvents ... Rename events	2016-06-26 10:47:39 +02:00
esteldunedain	18f09b9310	Rename events: ... - ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded - ace_cargoAddedByClass -> ace_cargoByClassAdded - ace_enteredCardiacArrest -> ace_cardiacArrestEntered - ace_itemAddedToTriageCard -> ace_triageCardItemAdded - ace_reload_linkedAmmo -> ace_reload_ammoLinked - ace_reload_returnedAmmo -> ace_reload_ammoReturned - ace_treatmentSuccess -> ace_treatmentSucceded - ace_common_engineOn -> ace_common_setEngine - ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations - ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations - ace_interaction_lampTurnOff -> ace_interaction_setLampOff - ace_interaction_lampTurnOn -> ace_interaction_setLampOn - ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel - ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint Close #3533	2016-06-24 10:45:13 -03:00
commy2	89ecc81111	convert common events to CBA playerEvents	2016-06-22 01:39:20 +02:00
PabstMirror	3972504d4a	Add dogtag actions to body bags	2016-06-21 12:13:32 -05:00
commy2	3fdc0dd521	Merge pull request #3955 from acemod/add_name ... add 'name' to components	2016-06-20 19:25:58 +02:00
BaerMitUmlaut	88b58216ee	Added beautified component names	2016-06-20 11:44:36 +02:00
Josuan Albin	a04dec0c63	Update french translation	2016-06-19 15:16:43 +02:00
commy2	c481ddedaf	add 'name' to components	2016-06-19 09:38:39 +02:00
Josuan Albin	d26f133733	Add missing french entries in stringtables and update older ones ... Take changes from #3480 and completed empty entries	2016-06-19 01:18:12 +02:00
Glowbal	74da8cc36c	Fix strange animation played when using PAK ... Fixes #1695	2016-06-18 13:12:49 +02:00
Glowbal	f6b744e741	Merge pull request #3945 from acemod/fix-gray-screen-medical ... Fix no gray screen for advanced medical	2016-06-18 11:59:14 +02:00
Glowbal	7dc76dee78	Fix no gray screen for advanced medical ... Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.	2016-06-18 11:55:03 +02:00
jonpas	03e923aa68	Cleanup Function Headers titles	2016-06-18 11:50:41 +02:00
KoffeinFlummi	e5ef31c556	Disable redefinition warnings	2016-06-16 23:40:46 +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
Glowbal	295ad3b037	Merge branch 'medical-impr' into merge-basic-and-advanced	2016-06-13 14:32:15 +02:00
Glowbal	38cdd523f0	Clean up medical function private declares	2016-06-13 14:27:43 +02:00
Glowbal	58f43f8a51	Remove unneeded and deprecated functions from medical	2016-06-13 12:24:28 +02:00
Glowbal	6657bde921	Change basic medical to use advanced medical injury system	2016-06-13 12:18:56 +02:00
Glowbal	792dbcd009	Change clean up privates in handleDamage code	2016-06-13 11:05:21 +02:00
Glowbal	8e59993d7a	Change clean up medical code	2016-06-13 10:55:19 +02:00
Glowbal	73bd684b65	Change formatting and private keywords in medical	2016-06-13 02:34:56 +02:00
Glowbal	3ba2396db7	Change minor clean up of handleUnitVitals	2016-06-13 02:11:21 +02:00
Glowbal	43a2b0ea29	Merge pull request #3909 from acemod/fix-bandaging-configuration ... Adjust bandage configuration	2016-06-12 23:25:16 +02:00
PabstMirror	1997cb5199	Add maxDam for medium velocity wounds ... Ensures that velocity wounds from a major hit will use the "Large" type of wound	2016-06-12 14:47:59 -05:00
Glowbal	fa1282406f	Change bandage configurations ... - Field dressing is average treatment - Packing bandage is average treatment, higher reopen change, longer reopening delay - Elastic bandage is higher treatment, higher reopen change, shorter reopen delay - QuikClot is lower treatment, lower reopen change, longer reopening delay	2016-06-12 20:40:45 +02:00
Butt4cak3	151d13244b	Improved misleading translation of german bandages (#3810) ... * Improved misleading translation of german bandages * Further improved german bandage names	2016-06-11 21:35:22 +02:00
Glowbal	7f9257716e	Merge pull request #2331 from acemod/323bloodyoverlay ... remove BI blood overlay	2016-06-11 20:49:54 +02:00
PabstMirror	dc6d5f1367	Temp fix for change to handleDamage in dev branch ... Fix #3892	2016-06-09 21:26:50 -05:00
jonpas	bd5f6107a0	Merge branch 'master' into eol-lf	2016-06-09 14:24:45 +02:00
Glowbal	8c9b31b1c7	Merge pull request #3815 from acemod/cbaEventSystem ... Deprecate ACE events framework	2016-06-09 14:20:26 +02:00
commy2	a61e4b3a4e	remove BI blood overlay	2016-06-06 14:14:45 +02:00
SilentSpike	90ebf9638b	Update common event names to meet new standard	2016-06-04 11:12:56 +01:00
SilentSpike	9e4fd77745	Update common event names to meet new standard	2016-06-03 22:39:43 +01:00
Glowbal	694503c01b	Fix medical events	2016-06-03 20:57:21 +02:00
Glowbal	fa2cf55156	Fix medical related events	2016-06-03 20:22:34 +02:00
PabstMirror	77baeda976	Merge branch 'master' into huehuehue	2016-06-03 00:01:13 -05:00
PabstMirror	db78dd53a8	Cleanup Merge and remoteFnc events	2016-06-02 19:59:18 -05:00
PabstMirror	d7f9c52c2f	Merge branch 'master' into cbaEventSystem	2016-06-02 19:29:30 -05:00
jonpas	b0352fdeb9	Merge branch 'master' into eol-lf	2016-06-02 17:02:09 +02:00
PabstMirror	637b5e02e9	Update 3den attributes to use 1.60 scaling (#3857)	2016-06-02 09:26:57 -05:00
jonpas	95573ee711	Stringtable URL (#3855) ... * Move url into stringtable to display it properly, Add some missing author and url entries * Fix main * Remove duplicate author	2016-06-01 23:45:51 +02:00
jonpas	1354826d56	Put semi-colon to the correct place	2016-06-01 14:11:32 +02:00
jonpas	1331265e65	Move url into a macro	2016-06-01 13:49:10 +02:00
jonpas	6730d016c2	Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility	2016-06-01 13:27:02 +02:00
jonpas	26fbc36cab	Merge branch 'master' into cbaEventSystem	2016-05-31 22:36:08 +02:00
commy2	fd26e2e44e	Merge pull request #3516 from acemod/cbamissiontime ... replace timePFH with CBA_missionTime	2016-05-30 21:23:57 +02:00
commy2	7512c4e52e	manual merge	2016-05-30 21:14:34 +02:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
commy2	e7fa02d0d9	Merge pull request #3812 from acemod/cbaDelayedExecFnc ... Use new CBA delayed execution functions and deprecate ACE functions	2016-05-30 21:02:29 +02:00
commy2	272775445f	Merge pull request #3670 from acemod/useQuotedFuncMacros ... Use new quoted function macros	2016-05-30 21:00:23 +02:00
jonpas	816da2aef1	Normalize to LF line endings	2016-05-30 18:37:03 +02:00
SilentSpike	207d6612da	Remove duplicate ACE_newEvents entries	2016-05-24 15:06:17 +01:00
SilentSpike	c4b75160a4	Run event renaming script	2016-05-24 14:13:11 +01:00
SilentSpike	108ff4f644	Replace ACE event system calls with CBA counterparts ... Regex used: \[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\) [$1,$3,$2] call CBA_fnc_targetEvent E?FUNC\((common,)?(server|global|local)Event\) CBA_fnc_$2Event E?FUNC\((common,)?(add|remove)EventHandler\) CBA_fnc_$2EventHandler	2016-05-22 16:47:39 +01:00
jonpas	f956ea557a	Merge branch 'master' into armake	2016-05-22 17:41:43 +02:00
jonpas	e7dbcd7b58	Replace delayed execution functions with new CBA counterparts	2016-05-22 15:29:01 +02:00
PabstMirror	f69142dd45	Hearing - New XEH, Fix dead effects, Medical var (#3802) ... * Hearing - New XEH, Fix dead effects, Medical var * Use setHearingCapability * Cleanup dead player vol update * Don't change global hearing in medical * Fix exitWith	2016-05-20 11:23:14 -05:00
commy2	d93132dac8	more replacing	2016-05-18 11:57:40 +02:00
commy2	da70854568	manual merge	2016-05-18 11:48:27 +02:00
commy2	cc9e128e74	Merge pull request #3792 from acemod/useGetUnitLoadout ... use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 13:04:35 +02:00
commy2	c5275813a4	use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it	2016-05-14 10:49:09 +02:00
Glowbal	04b61ff32e	Fix missing semicolon	2016-05-14 10:37:29 +02:00
Glowbal	180a0f9d84	Merge pull request #3462 from acemod/medicalLoops ... Cleanup medical PFHs	2016-05-14 09:39:14 +02:00
Glowbal	eb8390741b	Change round down mass of body bag ... Mass is an integer.	2016-05-14 09:23:29 +02:00
BaerMitUmlaut	38bb4f6c29	Adjusted weight of bodybag	2016-05-10 23:40:03 +02:00
Glowbal	83a8c488d9	Merge pull request #3751 from acemod/wipeoutWhitespace ... Cleaned up excessive whitespace	2016-05-04 11:46:56 +02:00
BaerMitUmlaut	7fcbe93b71	Cleaned up excessive whitespace	2016-05-03 02:32:44 +02:00
KoffeinFlummi	c02e7ead32	Fix medical paths	2016-05-02 16:49:33 +02:00
ProfessorCZ	7d0fcde9fa	CZ Translate - Update ... 04/30/2016	2016-04-30 00:57:24 +02:00
BaerMitUmlaut	65ccf66d00	Fixed redundant privates in setCardiacArrest	2016-04-18 15:23:04 +02:00
jonpas	ccaec31a90	Use new QFUNC and QEFUNC macros	2016-04-08 20:43:26 +02:00
jonpas	85b4366368	Use new QPATHTOF and QPATHTOEF macros	2016-04-08 20:34:50 +02:00
bux578	076803951d	Merge pull request #3628 from alef/translation/15bn/alef ... Italian translation	2016-03-31 06:54:31 +02:00
PabstMirror	bcde9f8ed6	Filter minor falling damage to non-leg hitpoints	2016-03-28 01:15:58 -05:00
Alessandro Foresi	e97c7c0f65	Translation: IT completed (with BOM)	2016-03-27 21:22:15 +02:00
Alessandro Foresi	e5a7578f92	Translation: IT completed (no BOM)	2016-03-27 21:20:15 +02:00
SzwedzikPL	cdcde46a7d	Fix double displayName in medical settings	2016-03-22 13:05:47 +01:00
Thomas Kooi	daceaa9dd8	Merge branch 'master' into settingsNameDescp	2016-03-18 14:48:11 +01:00
Thomas Kooi	61f1959109	Fix morphine increasing viscosity ... Morphine should decrease viscosity instead of increase. Closes #3579	2016-03-12 18:55:42 +01:00
Thomas Kooi	60af0d3162	Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR ... Standardize GVAR array brackets in configs.	2016-03-08 18:19:50 +01:00
PabstMirror	3232654e13	Close #3565 -Fix spelling of local var _woundEffectiveness	2016-03-08 11:02:54 -06:00
PabstMirror	b5e95f3945	Add some names/descriptions to settings configs	2016-03-08 01:17:40 -06:00
PabstMirror	e3deebff7e	Fix empty callback for hr adjustment ... Fix #3526 Same issue as #3384	2016-03-03 13:23:53 -06:00
commy2	467075ad67	replace timePFH with CBA_missionTime	2016-03-02 11:01:39 +01:00
commy2	fa3913752b	replace XEH_ENABLED macro with actual class, fix #3482, fix #3483	2016-03-01 17:05:00 +01:00
Jonathan Pereira	309f48ee0b	Added remaining PT-BR translarions	2016-03-01 08:56:43 -03:00
PabstMirror	fe967ff2bd	Don't read medic setting that is not in module	2016-02-29 14:07:15 -06:00
esteldunedain	9e682253f3	Move the dead body cleanup PFH to a loop using waitAndExecute	2016-02-28 23:33:51 -03:00
esteldunedain	90a54397ae	Move the litter cleanup PFH to a loop using waitAndExecute	2016-02-28 23:20:26 -03:00
esteldunedain	4b702f68df	Make loops non public	2016-02-28 23:10:15 -03:00
esteldunedain	94e8bee348	Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop	2016-02-28 23:08:25 -03:00
esteldunedain	12895e7983	Remove unneeded parameter	2016-02-28 22:58:09 -03:00
esteldunedain	0e82cdfe82	Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 22:50:04 -03:00
esteldunedain	21d4939abb	Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10	2016-02-28 22:08:59 -03:00
esteldunedain	35e13d5357	Fixes	2016-02-28 20:55:05 -03:00
esteldunedain	bbb84ec7d1	Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities	2016-02-28 20:50:28 -03:00
esteldunedain	085860c770	Restore addToInjuredCollection as a deprecated function	2016-02-28 20:32:02 -03:00
esteldunedain	bed51ac8a4	Fix waitAndExecute syntax	2016-02-28 20:26:05 -03:00
esteldunedain	3bbabac2d7	Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.	2016-02-28 20:12:56 -03:00
jonpas	8d326a0a1b	Remove duplicate medical string	2016-02-28 22:54:24 +01:00
VKing	8bb7b072d4	Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. ... This prevents any possible confusion when the GVARs are used in code.	2016-02-28 15:18:15 +01:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
jonpas	905586bddc	Make unused medical strings be used	2016-02-27 21:04:04 +01:00
System98	df3ec3a179	Fix length of a display name ... - Fix the length of a display name so it doesn't get cut off in the settings.	2016-02-27 12:51:32 +01:00
System98	a13b029b4a	Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations	2016-02-27 12:50:07 +01:00
Thomas Kooi	a0ea724db4	Merge pull request #3436 from acemod/register-last-damage-source ... Add registering last damage source	2016-02-27 12:42:11 +01:00
System98	05575538e4	Fix format errors in "medical" addon	2016-02-27 12:10:40 +01:00
System98	f7253edec8	Update german translations ... - Fix some german translations - Re-add strings in "medical" addon deleted in PR #3437 - Add german translations for previously deleted strings and update the english texts so the purpose of the function gets clearer	2016-02-27 12:07:57 +01:00
jonpas	0c79869d7a	Fix duplicated English strings	2016-02-27 01:43:57 +01:00
jonpas	10abe5cd57	Merge branch 'master' into German-translations	2016-02-27 01:36:07 +01:00
Glowbal	e0a65aa543	Add registering last damage source	2016-02-26 22:58:49 +01:00
bux578	db71aa54b8	Merge pull request #3434 from NorXAengell/Traduction-Fr ... Traduction fr	2016-02-26 21:18:40 +01:00
licht-im-Norden87	1c7a25cc38	Update stringtable.xml	2016-02-26 19:36:47 +01:00
NorXAengell	ea461446f9	Translation Fr	2016-02-26 19:24:53 +01:00
System98	e587744b3e	Fix text errors ... - Fix errors in "map_gestures, medical, overheating, slideshow and zeus" addons	2016-02-26 11:29:55 +01:00
SuN9491	9efbdb2e71	Spanish Translation (3.5.0) ... Remaining spanish translations for ACE 3.5.0	2016-02-25 20:50:29 +01:00
System98	48d312cb8e	Add german translations ... - add missing german translations - small fixes to existing texts - remove unused strings in "medical" addon	2016-02-25 18:10:26 +01:00
bux578	21ba45d0c9	Merge pull request #3421 from gienkov/pltranslation350 ... Polish translation 3.5.0 (FIXED)	2016-02-25 18:01:01 +01:00
gienkov	8ae1c68d5e	remove tabs	2016-02-25 17:20:45 +01:00
Nicolás Badano	333c8f57bc	Merge pull request #3419 from acemod/addMissingMedicalSettingCategory ... Add missing medical category to delayUnconCaptive	2016-02-25 13:16:23 -03:00
jonpas	6ad107ecc0	Add medical category to delayUnconCaptive	2016-02-25 17:03:38 +01:00
gienkov	04f714e53c	Merge remote-tracking branch 'origin/master' into pltranslation350	2016-02-25 16:41:09 +01:00
gienkov	25561ab2c5	hearing and medical, unwind medical pl shorts	2016-02-25 16:31:47 +01:00
esteldunedain	3fa3512509	Remaining spanish translations	2016-02-25 12:25:42 -03:00
esteldunedain	64a62d65fc	More spanish translations	2016-02-25 11:46:56 -03:00
Nicolás Badano	d02a590886	Merge pull request #3406 from acemod/diePurista ... Replace Purista with Roboto - everywhere	2016-02-25 09:56:16 -03:00
Nicolás Badano	ae2ce0eebc	Merge pull request #3124 from acemod/delayUnconCaptiv ... add delay to Unconsciousness Captivity	2016-02-25 09:54:27 -03:00
jonpas	7f022eda00	Replace Purista with Roboto - everywhere, close #3401	2016-02-24 15:06:27 +01:00
PabstMirror	7cf912222b	Merge pull request #3393 from acemod/3denReplaceDropDown ... Fix 3den attributes	2016-02-23 17:09:03 -06:00
jokoho48	0956b97dce	remove module settings ... change defualt in ACE_Settings	2016-02-23 15:49:03 +01:00
jokoho48	c61763edc9	fix simicolon ... add stringtable entrys	2016-02-23 15:37:28 +01:00
jokoho48	b2d2bec2cf	Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv ... # Conflicts: # addons/medical/functions/fnc_setUnconscious.sqf	2016-02-23 15:31:38 +01:00
bux578	aa8d3a3fd0	Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis ... Unified ellipsis	2016-02-23 08:27:28 +01:00
BaerMitUmlaut	74ea79e2cc	Unified ellipsis	2016-02-22 23:51:47 +01:00
PabstMirror	330792ba7a	Add medic threeden control	2016-02-22 11:26:32 -06:00
commy2	0f7bfc0f66	Merge pull request #3389 from acemod/precompileongamestart ... precompile on game start	2016-02-22 16:00:19 +01:00
commy2	46a239f9f6	precompile on game start	2016-02-22 15:20:36 +01:00
PabstMirror	2467fa7b0c	Fix empty callbacks in medical/repair	2016-02-21 11:34:25 -06:00
bux	38c1b45fb9	properly fix the medical translation file	2016-02-21 11:41:53 +01:00
PabstMirror	3fbd6cff18	Merge pull request #3368 from acemod/fixNils ... Fix some undefined functions / strings	2016-02-20 19:49:07 -06:00
Glowbal	ea113b8e61	Fix duplicate {	2016-02-21 01:04:12 +01:00
Glowbal	7d063d4dee	Merge branch 'master' into medical-focus-feature ... Conflicts: addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf	2016-02-21 00:37:30 +01:00
PabstMirror	8b932fd5a0	Fix some undefined functions / strings	2016-02-20 16:58:45 -06:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
Thomas Kooi	2930fab6c6	Merge pull request #3354 from acemod/playerBodybags ... Fix bagging respawning players (alt)	2016-02-20 17:26:07 +01:00
Thomas Kooi	4f10d551d6	Merge pull request #2949 from gienkov/fixWoundCount ... ceil number of wounds	2016-02-20 16:56:17 +01:00
PabstMirror	fc3bb0de6b	Fix #3355 - add missing semi-colons	2016-02-19 18:51:25 -06:00
PabstMirror	dffcbc7650	Cleanup events	2016-02-19 15:45:37 -06:00
PabstMirror	44b526ab6d	bodybag - hide player corpse and delete later ... Fix #1301	2016-02-19 15:41:13 -06:00
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
Grzegorz	95250c8ecd	medical PL translation ... 3.5.0 ready	2016-02-19 19:10:59 +01:00
Thomas Kooi	95532ea521	Merge pull request #3333 from acemod/medicalEvents ... Replace execRemoteFnc in ace_medical	2016-02-19 12:00:00 +01:00
commy2	5d0d8576ea	Merge pull request #3288 from SzwedzikPL/edenassignsettings ... Repair & medical object attributes for eden editor	2016-02-19 11:47:26 +01:00
commy2	be8f7f9cc0	Merge pull request #3276 from acemod/156selectapply ... replace filter and map with select and apply	2016-02-18 14:23:02 +01:00