1976 Commits

Author	SHA1	Message	Date
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
esteldunedain	88eae19646	Replace execRemoteFnc in ace_medical	2016-02-17 22:54:43 -03:00
PabstMirror	be742c13cd	Merge branch 'master' into 155selectRandom	2016-02-17 15:58:19 -06:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
Thomas Kooi	26cb6bd6a3	Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant ... Make wound assignment consistent for dll/sqf	2016-02-17 18:34:28 +01:00
PabstMirror	40396fc69e	Remove debug	2016-02-17 09:37:08 -06:00
PabstMirror	f1797feead	Make wound assignment consistent for dll/sqf ... Dll now exits on first match for threshold damage (exitWith) Remove random wound in sqf to match dll Fix backblast threshold order Add lower vehiclecrash threshold Add dll version logging	2016-02-16 12:19:18 -06:00
PabstMirror	5c9dfd7dc5	Handle enemy causing veh explode, fix revive unload ... Fix #3269	2016-02-15 22:23:37 -06:00
PabstMirror	9441b548be	Fix vehicle crashes not being fatal to non-drivers ... Fix #3306	2016-02-15 17:11:04 -06:00
Glowbal	ff86359247	Merge branch 'master' into medical-focus-feature	2016-02-13 19:51:45 +01:00
Ivan Krouglyi	0a226b5ee9	Update fnc_treatment_success.sqf ... Error at 84 line - you forget ";"	2016-02-13 03:29:42 +03:00
PabstMirror	ff4ba98e68	Pre-load again on mission load (save game)	2016-02-10 11:50:30 -06:00
commy2	82086efca0	manual merge	2016-02-10 10:11:33 +01:00
PabstMirror	e1b83b8172	Manually pre-load for StaticWeapons and Car ... Fix #3168	2016-02-09 22:43:38 -06:00
SzwedzikPL	0c80551fd8	ace attribute category, lower case classes	2016-02-10 01:17:18 +01:00
SzwedzikPL	94ea26c7b9	typo fix	2016-02-08 00:14:55 +01:00
SzwedzikPL	3bfac35b65	ace repair and medical attributes	2016-02-07 23:56:45 +01:00
Glowbal	e754c89c73	Remove non functional event driven handleDamage	2016-02-07 13:18:19 +01:00
Glowbal	575f362fb6	Add setting for limiting usage of Epinephrine in basic medical #1792 ... Part of focus feature medical #3134. Default settings are inline with old default.	2016-02-07 13:10:38 +01:00
Glowbal	bfd90cd5d3	Add Adenosine to replace atropine #1573	2016-02-07 12:54:23 +01:00
Glowbal	39cf11367f	improve medical bandage configuration	2016-02-07 12:37:00 +01:00
Glowbal	84878c3d8b	Merge branch 'master' into medical-focus-feature	2016-02-07 12:11:25 +01:00
commy2	ac007e6995	replace more map with apply	2016-02-06 12:08:04 +01:00
PabstMirror	35333cbe9d	Merge branch 'cargoCleanup'	2016-02-04 12:51:52 -06:00
Thomas Kooi	69746a133b	Merge pull request #3254 from ProfessorCZ/master ... Czech Translation - Update	2016-02-04 19:36:28 +01:00
PabstMirror	336184dfaa	Change medication removal from array	2016-02-04 10:00:33 -06:00
PabstMirror	3cc10a27ce	Tourniquets block medication until released ... Close #2704	2016-02-03 14:40:26 -06:00
ProfessorCZ	61611d0ec7	Czech Translation - Update ... Update	2016-02-03 18:31:31 +01:00
PabstMirror	46d6e92bca	Add quick debug defines to all script_components	2016-01-28 23:26:02 -06:00
PabstMirror	c0eccc67c3	Change all SCALAR to NUMBER in headers	2016-01-28 18:19:15 -06:00
PabstMirror	17a882fe4d	Add findUnloadPosition integration	2016-01-26 18:01:01 -06:00
Glowbal	34613b42f2	Increase heart rate increase speed #3134	2016-01-20 11:49:10 +01:00
PabstMirror	04bccf47d7	Replace all use of deprecated commands	2016-01-19 09:39:07 -06:00
Glowbal	86158ac45b	Stage improvements bandage effectiveness	2016-01-17 14:09:22 +01:00
Glowbal	7de1a7bc6c	add initial implementation of drowning and collision damage handling	2016-01-17 13:21:18 +01:00
Glowbal	209d10065b	Fix missing event log entries #3134	2016-01-17 12:28:37 +01:00
Glowbal	6e42a10d47	Add selectionDamage implementation	2016-01-17 12:28:08 +01:00
Glowbal	ee9a620a63	Merge branch '340handledamage' into medical-focus-feature	2016-01-16 22:03:28 +01:00
Thomas Kooi	c8c91d2af7	Merge pull request #3138 from acemod/increaseTrainingInLocations ... Medical Locations Boost Training	2016-01-16 21:59:45 +01:00
PabstMirror	1affbd7d2f	Move littler syncedEH install to after settingInit	2016-01-14 17:06:46 -06:00
PabstMirror	c2f780e95f	#1259 - Medical Locations Boost Training	2016-01-09 23:54:48 -06:00
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
Glowbal	c042703786	Merge branch 'release'	2016-01-05 22:55:34 +01:00
commy2	7eaa55f9df	Merge pull request #3022 from acemod/bodybagevent ... add event for placing units in body bags	2016-01-05 21:59:47 +01:00
Alessandro Foresi	c16d97cad0	Merge branch 'master' into translation/15bn/alef	2016-01-03 12:23:27 +01:00
PabstMirror	fb0738bd30	Merge branch 'master' into release	2015-12-31 20:27:26 -06:00
PabstMirror	cf27571b5a	Merge pull request #3007 from dudakov/master ... Russian Translations - Update	2015-12-31 14:11:45 -06:00
PabstMirror	2e211c5a04	Fix Medical Triagecard Macro ... Fix #3087	2015-12-31 01:46:24 -06:00
bux	0e8eb5fac4	Remove obsolete hotkey entries	2015-12-30 11:23:52 +01:00
Glowbal	c1fa81f28b	Fix tabs in sqf files	2015-12-21 17:05:48 +01:00
PabstMirror	74aec45921	Fix medical menu not closing on range, litter dir ... - Medical Menu didn't close when target moved out of range - Litter was always created in the same direction	2015-12-19 20:50:57 -06:00
PabstMirror	886c13f6a9	Merge pull request #3013 from acemod/bloodyLitter ... Fix litter for adv - Add bloody p3d for Pack/qClot	2015-12-14 19:23:51 -06:00
commy2	7f63d51ccb	add event for placing units in body bags	2015-12-12 18:21:11 +01:00
PabstMirror	a501c7e1c3	Remove new models and just combine existing litter	2015-12-11 19:47:40 -06:00
PabstMirror	db50b5313d	getName can return raw or sanatized html tags	2015-12-11 12:01:50 -06:00
PabstMirror	e9be05209a	Fix litter for adv - Add bloody p3d for Pack/qClot ... Fix #2950 Get correct bloodLossOnSelection for both basic and advanced Adds bloody versions of packing bandage and quickClot	2015-12-10 22:58:44 -06:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03:00
PabstMirror	cae9f436f6	Merge branch 'release'	2015-12-08 15:14:33 -06:00
PabstMirror	39edd205f0	Merge pull request #2942 from acemod/CzechTables ... Czech Translations - Update	2015-12-07 09:32:00 -06:00
bux578	fbde1dd794	Merge pull request #2941 from acemod/DieStringtables ... Update German Stringtables	2015-12-07 10:27:11 +01:00
PabstMirror	358228f5bb	Cleanup De Stringtables	2015-12-06 15:03:15 -06:00
gienkov	1132efaf48	ceil number of wounds	2015-12-06 02:57:21 +01:00
PabstMirror	b13656e54b	addDamageToUnit - Disable debug / testing code	2015-12-05 12:19:34 -06:00
ProfessorCZ	cf41ac5fba	Czech Translations - Update	2015-12-04 22:28:10 -06:00
licht-im-Norden87	291f4df072	Update German Stringtables ... Update stringtable.xml Update stringtable.xml Update stringtable.xml kommas........................................................................................................................................................... Rallypoint Update stringtable.xml slideshow, not finished yet Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml Update stringtable.xml What does Curator mean in this context? l. 294, l 302 cargo Update stringtable.xml Update stringtable.xml I left a few things out. I'd like if someone gives me advice Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma? Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört... Update stringtable.xml Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden. Update stringtable.xml Update stringtable.xml Update stringtable.xml Fix Mistakes from merge Fix Empty Entries Fix Mistake Fix	2015-12-04 22:06:44 -06:00
PabstMirror	875b3980ac	Don't update openWounds if not bandaged ... Fix #2921	2015-12-03 15:23:38 -06:00
commy2	411a8d58f3	fix more setVariable and getVariable capitalization	2015-11-30 17:53:57 +01:00
commy2	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	a9ebcf8543	fix setVariable and getVariable capitalization	2015-11-30 17:27:09 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +01:00
commy2	2b05f6f451	fix isNil capitalization	2015-11-30 17:22:16 +01:00
commy2	5e41643cff	fix pushBack capitalization	2015-11-30 17:21:28 +01:00
commy2	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
commy2	34d351c652	fix exitWith capitalization	2015-11-30 17:14:05 +01:00
commy2	0b84bb514b	fix Cfg capitalization	2015-11-30 17:09:26 +01:00
commy2	dcf0a68b80	Revert "fix Cfg capitalization" ... This reverts commit 43bda9c462.	2015-11-30 17:00:32 +01:00
commy2	43bda9c462	fix Cfg capitalization	2015-11-30 16:52:20 +01:00
commy2	ff4406e411	manual merge, more selectRandom command useage	2015-11-29 16:48:23 +01:00
commy2	e5c4d35969	1.55 use new selectRandom command	2015-11-29 16:33:25 +01:00
Thomas Kooi	5282e95668	Merge pull request #2876 from acemod/medicalTranslateHP ... Medical Fixes	2015-11-28 20:58:08 +01:00
Thomas Kooi	cef01baf0b	Merge pull request #2856 from acemod/isEqualTypeRepalcement ... 1.54 - Replace typeName with isEqualType	2015-11-28 20:36:07 +01:00
Thomas Kooi	b807d1db48	Merge pull request #2886 from acemod/bandageReopen ... Add all wound types to bandage treatment configs	2015-11-28 20:32:13 +01:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
PabstMirror	6031eb8c6e	Add all wound types to bandage treatment configs ... Fix by adding all config entries; instead of trying to modify classname	2015-11-27 14:19:26 -06:00
ViperMaul	8d4364350c	Fix for "double semicolon detected" error	2015-11-27 10:43:30 -08:00
PabstMirror	e51f658ce0	Try base wound class in bandage treatment configs ... Gets the correct wound for the bandage treatment config Used for selecting most effective bandage and reopening _className was something like "velocityWoundMedium" but configs only had base class "velocityWound"	2015-11-26 23:18:39 -06:00
PabstMirror	a5c45c137f	Medical - addDamageToUnit Helper	2015-11-26 09:53:12 -06:00
PabstMirror	988a5c76bb	Medical - 1.54 Changes ... 1.54 Armor Translate selectiosn to hitpoints Calc newDamage using hitIndex (because sel is translated) Fix isFalling never being reset Cache hitpointIndex to reset damage Normalize Limb Armor to 1.54 Cleanup Cleanup	2015-11-25 11:49:20 -06:00
PabstMirror	20bf90f3e9	Medical - Fix Hitpoints Macro when building	2015-11-24 16:30:09 -06:00
PabstMirror	c2564de5ef	Fix UBC for 1.54 ... Soldiers no longer inherit hitpoints from CaManBase Adds a macro to deal with them	2015-11-20 23:27:29 -06:00
Thomas Kooi	801120fb39	Merge pull request #2841 from acemod/medicalAiBandage ... Move bandage log before basic exit	2015-11-20 22:28:55 +01:00
PabstMirror	c4117e1283	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-20 14:37:23 -06:00
PabstMirror	69b53af1d3	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
kaban	f8481ae5f2	Merge branch 'master' of https://github.com/acemod/ACE3.git into develop ... Conflicts: addons/captives/stringtable.xml	2015-11-18 06:39:58 +03:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
commy2	a57d1bca75	replace local keyword with private	2015-11-17 17:43:07 +01:00
PabstMirror	c3e6990d00	#2528 (6) - Move bandage log before basic exit ... In advanced medical without enableFor AI. Bandaging an AI would exit before adding log.	2015-11-12 01:06:29 -06:00
Thomas Kooi	ec1187e79b	Merge pull request #2830 from acemod/mixedMedicalDisplay ... Display basicMed wounds for AI in mixed mode	2015-11-10 08:33:21 +01:00
PabstMirror	c91789f3c4	Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking	2015-11-06 20:30:12 -06:00
PabstMirror	c326bc2f87	#2772 - Display basicMed wounds for AI in mixed mode	2015-11-06 01:05:25 -06:00
kaban	e2763dde27	Russian Translations - Update	2015-11-05 03:28:53 +03:00
PabstMirror	1cebe613fa	Fix Capitialzation	2015-11-04 14:38:32 -06:00
PabstMirror	c5da32e470	Medical Handle Damage - check hitpoints if selection is weird	2015-11-04 14:36:26 -06:00
PabstMirror	a3443cae43	Merge pull request #2780 from acemod/fixTimeInComments ... Changed ACE_time back to time in comments where appropriate	2015-11-04 13:04:05 -06:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
Glowbal	8f6e9be636	Add method to deal with new hitpoints ... This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names. This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.	2015-11-01 16:35:25 +01:00
Jonathan Pereira	ce5364d7af	Added PT-BR translations ... Added all remaining translations, including dagr, dragging, map, map_gestures, medical, repair, tacticalladder and zeus.	2015-10-26 22:04:03 -02:00
Glowbal	b5539db27f	Merge pull request #2767 from acemod/canTreatLocation ... Fix medical location check when set to disabled for PAK/Surgical	2015-10-24 00:55:51 +02:00
VKing	069169cc72	Changed ACE_time back to time in comments where appropriate	2015-10-21 22:52:21 +02:00
Glowbal	57abe3b885	Merge pull request #2743 from acemod/medicalStuff ... Medical Menu Fixes	2015-10-19 22:47:13 +02:00
PabstMirror	cfde11d2fa	Fix medic treatment location check as well	2015-10-19 01:45:30 -05:00
PabstMirror	aad6cab896	#2765 - Fix location check when set to disabled	2015-10-19 01:20:11 -05:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
Glowbal	76efdbcc1c	Merge pull request #2257 from jonpas/parseList ... Parse List Common Function	2015-10-18 12:14:18 +02:00
Glowbal	94ed78a173	Merge pull request #2578 from alganthe/strings_fix ... PAK and Surgical Kit strings normalized inside modules.	2015-10-11 12:05:11 +02:00
PabstMirror	4ba0d72bfd	#2580 (1) - Fix bandages always created at terrain level.	2015-10-10 23:09:52 -05:00
gienkov	b6d2cdee69	Merge remote-tracking branch 'origin/master' into pl-strings	2015-10-04 12:25:55 +02:00
Glowbal	58ea8d5e2c	Merge pull request #2543 from alef/feature/death_short_diagnose ... Remove: pain diagnosis on dead patients	2015-10-04 09:34:10 +02:00
Glowbal	9ce4ce6cdd	Merge pull request #2582 from acemod/fixLitterFloating ... fix Littergeneric fly over ground	2015-10-04 09:32:03 +02:00
Glowbal	e36df978ec	Merge pull request #2646 from DerekSauer/FixArmaInjury ... Fix healHitPointAfterAdvBandage - Issue #2498.	2015-10-04 09:28:47 +02:00
PabstMirror	b0b755720c	#2672 - Use ACE_gameTime for triage card	2015-10-03 12:28:54 -05:00
commy2	573279bd30	add selection, collision, fall and drowning damage events	2015-10-02 23:19:14 +02:00
Derek Sauer	f9352de489	Clarified comment slightly.	2015-09-30 20:34:51 -04:00
Derek Sauer	0a788a282e	Improved efficiency of wound counting. ... Using a switch/case conditional since it offers early termination if a matching condition is found before all conditions are checked. It also unnecessary to use a conditional to confirm whether a limb is wounded or not. Number of Wounds multiplied by Blood loss will return zero for a fully bandaged body part, not incrementing the wound counter; or it will return some other number which will increment the wound counter.	2015-09-30 20:27:40 -04:00
Derek Sauer	f69f4066e9	Fix capitalization on forEach and getVariable.	2015-09-30 06:17:54 -04:00
Derek Sauer	2824009317	Incorrectly retrieving list of current wounds. ... Used the wrong method to retrieve the target's current wounds and was getting an empty array. This caused bandaging any wound even once to completely heal the target on the Arma side.	2015-09-29 17:00:49 -04:00
Derek Sauer	8d05214eb0	Resolve merge conflict from upstream pull.	2015-09-29 16:24:17 -04:00
gienkov	d88d2fe578	Merge remote-tracking branch 'origin' into pl-strings	2015-09-29 21:56:29 +02:00
Derek Sauer	954fad615a	Reformatted to follow ACE3 coding guidelines.	2015-09-29 06:36:36 -04:00
Derek Sauer	8619f02538	Take into account wounds that do no cause blood loss.	2015-09-29 06:19:49 -04:00
Derek Sauer	a864a3411c	Clarified a comment.	2015-09-28 21:32:04 -04:00
Derek Sauer	488541bba6	Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.	2015-09-28 20:08:07 -04:00
jonpas	4521df0a57	Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter	2015-09-28 16:17:12 +02:00
jonpas	db2572acfd	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-28 16:06:32 +02:00
Glowbal	74805caa5d	Merge pull request #2565 from acemod/medVehAssignFix ... assign vehicle module fix for prefilled veh	2015-09-28 15:02:48 +02:00
commy2	07774647e9	delay setUnconscious until the settings are inited, fix #148	2015-09-26 19:30:13 +02:00
jokoho48	f7787730e1	fix Littergeneric fly over ground(add Landcontact Points)	2015-09-23 20:17:16 +02:00
KoffeinFlummi	3471ebef16	Merge https://github.com/dudakov/ACE3 into russian-merge	2015-09-23 19:17:52 +02:00
alganthe	10296d2883	PAK and Surgical Kit strings normalized inside modules. ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-23 15:50:50 +02:00
PabstMirror	f93538eb9a	#2423 - assign vehicle module fix for prefilled veh	2015-09-21 21:44:52 -05:00
PabstMirror	079d88ded7	Merge pull request #2509 from acemod/miscFixNilFunctions ... Fix some nil functions	2015-09-21 20:36:09 -05:00
gienkov	bbccfbaa35	pl medical string	2015-09-22 01:04:46 +02:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
jonpas	2e3014daa3	Merge branch 'master' into parseList ... Conflicts: addons/common/functions/fnc_assignObjectsInList.sqf	2015-09-21 22:46:01 +02:00
Glowbal	6b93760f9b	Merge pull request #2557 from alganthe/torso_diag_fix ... Torso diag fix	2015-09-21 22:27:13 +02:00
PabstMirror	1d5217d165	Medical - delayedUnconsicous fix waitAndExecute	2015-09-21 12:43:35 -05:00
PabstMirror	86fae2c251	#2528 - addToLog date / missing string fullHeal	2015-09-20 13:19:51 -05:00
PabstMirror	7687374fcf	Merge branch 'master' into miscFixNilFunctions ... Conflicts: addons/common/functions/fnc_resetAllDefaults.sqf	2015-09-20 11:25:33 -05:00
Alessandro Foresi	aabc437314	Remove: pain diagnosis on dead patients	2015-09-20 17:37:33 +02:00
alganthe	4265b11d51	wrong target fixed ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-20 14:13:22 +02:00
SilentSpike	35d94e8d5c	Fix medical litter scopeCurator values ... Solves #2526 where medical litter would appear in zeus with no name.	2015-09-19 19:37:38 +01:00
PabstMirror	5f0d73bab6	Cleanup more stuff	2015-09-18 14:24:20 -05:00
PabstMirror	c62ea5e406	Fix some nil functions	2015-09-18 13:47:19 -05:00
esteldunedain	a621a0c693	Fixes to spanish translations	2015-09-18 13:36:57 -03:00
esteldunedain	3422f5a7f1	Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation ... Conflicts: addons/medical/stringtable.xml addons/repair/stringtable.xml	2015-09-18 13:20:22 -03:00
commy2	7336e694c1	Merge pull request #2480 from acemod/340doanim2tweak ... tweak doAnimation switchMove to do no akward camera jumps whenever possible	2015-09-17 22:46:54 +02:00
PabstMirror	7faee2e6ff	Merge pull request #2492 from acemod/fixCPR ... Fix CPR params	2015-09-17 12:37:45 -05:00
PabstMirror	5fc127e94c	#2491 - fix params	2015-09-17 11:34:32 -05:00
KoffeinFlummi	067b08611e	Fix missing newlines	2015-09-17 12:54:26 +02:00
commy2	a09ca8fb80	tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474	2015-09-17 12:23:56 +02:00
kaban	4d2707eae2	Russian Translations - Update	2015-09-17 12:21:21 +03:00
kaban	341e122e4c	Russian Translations - Update	2015-09-17 11:43:14 +03:00
alganthe	49e0befbaf	added diagnose to torso ... Signed-off-by: alganthe <alganthe@live.fr>	2015-09-16 19:44:44 +02:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +02:00
gienkov	a66f4d0e09	Merge remote-tracking branch 'origin/master' into pl-translation-8	2015-09-16 11:44:35 +02:00
Glowbal	7e5ab07e32	Merge pull request #2387 from acemod/FixHCPPE ... Fix that PPEffects Throw a error on HC	2015-09-15 21:04:37 +02:00
Glowbal	478b618e4b	Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros ... Feature/switch to log macros	2015-09-15 14:51:23 +02:00
Glowbal	d52cc917ea	Merge pull request #2419 from acemod/FixBBTexturePath2 ... Fix Bandage Texture Path and UV	2015-09-14 23:26:00 +02:00
Glowbal	7b7ad6eea8	fixed tweak to basic bandage	2015-09-14 23:18:20 +02:00
Glowbal	10ac127159	Fixed incorrect new damage value in handleDamage advanced. ... The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.	2015-09-14 21:15:57 +02:00
Glowbal	33ac78dbac	Addresses the large amount of bandages required in basic medical ... This should restore the bandaging behavior back to how it is before the adjustments made to basic medical	2015-09-14 21:14:56 +02:00
Glowbal	8c60e76979	Tweaks made to improve determine if fatal algorithm	2015-09-14 21:13:58 +02:00
Glowbal	37639066c2	Include missing frame in the caching execution	2015-09-14 15:19:58 +02:00
Glowbal	6d4744b9ea	Increased duration of knock down for basic medical	2015-09-14 15:19:18 +02:00
Glowbal	032dd6c87c	Tweaked visual effects.	2015-09-14 15:18:56 +02:00
jokoho48	fb75f6ad9e	Fix Bandage Texture Path and UV	2015-09-13 18:57:07 +02:00
Alessandro Foresi	89eb98a248	Added: IT more translation, medic partial ... Fixed: dup entries (from gienkov)	2015-09-12 23:16:57 +02:00
Alessandro Foresi	d4cb290930	Tweaked: shorter sentence, fixed "pressione"	2015-09-12 22:00:43 +02:00
Alessandro Foresi	8fe629e953	Changed: epi to adrenalina, more wording fixing	2015-09-12 22:00:41 +02:00
Alessandro Foresi	5d74dd1aed	Tweak: Better wording	2015-09-12 22:00:40 +02:00
Alessandro Foresi	15e7f9b767	Add: IV now EV (endovena)	2015-09-12 22:00:39 +02:00
bux578	9748abdb48	change order of BloodPressure readout, fix #2400	2015-09-12 10:58:29 +02:00
Alessandro Foresi	16fd6b490d	Add: IT translation for medical	2015-09-12 09:42:48 +02:00
gienkov	ef36b27fe2	medical pl translation	2015-09-11 23:49:41 +02:00
SilentSpike	17f9eab03a	Improve display name of medical heal hitpoints setting ... ace_medical_healHitPointAfterAdvBandage had a slightly misleading display name that didn't quite convey what it is actually doing	2015-09-11 12:33:18 +01:00
KoffeinFlummi	63c2712360	Merge branch 'release' into portuguese	2015-09-10 21:59:30 +02:00
KoffeinFlummi	c2ffe7cad0	Merge branch 'release' into russian	2015-09-10 21:05:32 +02:00
KoffeinFlummi	83aa2cc68c	Merge branch 'release' into french	2015-09-10 19:36:56 +02:00
FreeZbe	fa7943c8be	Update French translations	2015-09-10 19:14:51 +02:00
jonpas	e07b71faf0	Merge branch 'master' into parseList ... Conflicts: addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf	2015-09-09 19:13:04 +02:00
jokoho48	defbdf1b1a	fix that HC throw a issue if PPEffect was used/applyed	2015-09-09 17:05:48 +02:00
Michael Braun	a5fb09a7e1	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/repair/functions/fnc_moduleRepairSettings.sqf	2015-09-09 02:55:12 +02:00
Glowbal	0c371ddf37	disabled debug for medical	2015-09-08 19:06:01 +02:00
gienkov	ad50c1ab4b	medical and repair translation	2015-09-07 16:15:18 +02:00
commy2	adb1a11211	increase leg and arm armor value, more TRACE debug	2015-09-06 11:49:08 +02:00
ViperMaul	98202f4f38	Additional debug statements for caching and wounds.	2015-09-05 15:31:14 -07:00
jonpas	8fc061bfd6	Merge branch 'master' into parseList	2015-09-05 20:16:59 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03:00
Glowbal	0a6b77b902	Removed more deprecated wound sync code	2015-09-05 14:10:28 +02:00
Glowbal	e4c246984f	Removed another debug trace that should not be there	2015-09-05 14:10:04 +02:00
Glowbal	d9af19df28	properly fixes unconscious weird behavior. Because it never registered any unconscious conditions.	2015-09-05 14:08:46 +02:00
Glowbal	dad96822be	Only add 1/4 of the new damage to pain instead of everything.	2015-09-05 13:27:02 +02:00
Glowbal	f15a1c033d	Added allowSelfTreatment attribute to treatment actions	2015-09-05 13:20:19 +02:00
Glowbal	a4e406658f	Reduced initial knockdown time for basic medical	2015-09-05 13:02:19 +02:00
Glowbal	17ad7ecb8c	replaced diag_logs by trace	2015-09-05 12:59:09 +02:00
Glowbal	9c0288cd3f	Removed debug message	2015-09-05 12:55:49 +02:00
Glowbal	c828544d02	Added init stacking	2015-09-05 12:50:32 +02:00
Glowbal	c673ea2cbb	Restored uniqueIds	2015-09-05 12:38:12 +02:00
Glowbal	17648739dd	Removed more deprecated wound sync code	2015-09-05 12:37:01 +02:00
Glowbal	6b73eafcce	Allow users to disable medical 3d interaction.	2015-09-05 12:31:52 +02:00
Glowbal	268220bbae	Possible fix for weird unconscious behavior in basic medical	2015-09-05 12:20:40 +02:00
Glowbal	4122b32dba	Removed deprecated wound sync code	2015-09-05 12:02:09 +02:00
Glowbal	e0db571e13	Minor adjustment to fatality change on torso damage	2015-09-05 12:00:45 +02:00
Glowbal	130569c485	Made basic medical bleeding information work with new damage system	2015-09-05 11:57:17 +02:00
Glowbal	39ff82e764	fixes for CPR condition in basic medical and improvements to lethalDamage	2015-09-05 11:52:12 +02:00
Glowbal	4514812523	Basic bandaging now works with new damage system	2015-09-05 11:51:46 +02:00
Glowbal	cd9e5df782	Clean up of handleDamage. Fixes some debug code	2015-09-05 11:25:56 +02:00
Glowbal	df3dbc9772	Removed deprecated fire handling	2015-09-05 11:25:31 +02:00
Glowbal	a25f640614	fixes #2114 No CPR available in basic medical when revive is enabled	2015-09-05 11:07:10 +02:00
Glowbal	3d342ece20	Fixes #2156 Animation is still played even if you cancel any treatment	2015-09-05 11:04:11 +02:00
ViperMaul	4c0c7bc290	debug change	2015-09-04 10:21:10 -07:00
ViperMaul	7f58d5a94d	Revert "Adding same ADV special case to BASIC handle damage." -Not Needed ... This reverts commit bf267246bf.	2015-09-04 10:20:34 -07:00
jonpas	644460ed96	Merge branch 'master' into parseList ... Conflicts: addons/slideshow/functions/fnc_makeList.sqf	2015-09-04 18:40:35 +02:00
ViperMaul	bf267246bf	Adding same ADV special case to BASIC handle damage.	2015-09-04 07:48:16 -07:00
ViperMaul	2bc20501bc	Adding more debug	2015-09-04 07:46:35 -07:00
ViperMaul	813e54a668	Fixing Debug for object variable hasPain	2015-09-04 07:37:20 -07:00
ViperMaul	89b0c05929	Fixed a debug statement.	2015-09-03 13:17:59 -07:00
commy2	b737f42777	fix error when opening triage card	2015-09-03 18:30:29 +02:00
commy2	795b7a893f	Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2	2015-09-03 17:18:32 +02:00
ViperMaul	6d28214287	Add some debug values.	2015-09-03 08:18:37 -07:00
commy2	0bd92af072	fix variables not inited, csat armor scaleing	2015-09-03 17:17:54 +02:00
commy2	e753131f2d	arms and legs to vulnerable, better scaling for pilots and csat	2015-09-03 16:17:48 +02:00
commy2	a84be46ed4	fix errors from cleanup	2015-09-03 15:49:49 +02:00
kaban	08b7110e58	Russian Translations - Update	2015-09-03 04:54:52 +03:00
kaban	91cae690c0	Russian Translations - Update	2015-09-03 03:36:15 +03:00
Glowbal	f38d245771	fixed bloodloss for basic medical	2015-09-02 21:56:00 +02:00
commy2	f939f9215e	stop flickering of wounds, fix #346	2015-09-02 20:49:17 +02:00
commy2	7d2f1f52a4	remove protection, hitpoint config (fix ubc), some debug stuff	2015-09-02 20:13:51 +02:00
commy2	dc5e6b7c3c	Merge branch '323medicalstrcturaldamage' into medical-adjustments	2015-09-02 20:02:19 +02:00
commy2	9665f73fa3	Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments	2015-09-02 17:03:36 +02:00
Michael Braun	035b3432c5	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/common/XEH_postInit.sqf	2015-09-01 08:45:59 +02:00
commy2	5a164c5cdc	fix UBC issues, simplify uniform hitpoint config	2015-08-31 23:36:59 +02:00
commy2	f15805d1f3	setStructuralDamage function	2015-08-31 20:05:38 +02:00
Glowbal	8c6f896164	fixed script error when canceling treatment actions	2015-08-31 13:00:17 +02:00
KoffeinFlummi	5f63290508	Merge branch 'ptbr'	2015-08-30 00:42:31 +02:00
KoffeinFlummi	a7f2a7fefc	Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3	2015-08-30 00:35:11 +02:00
Glowbal	4bde554854	Merge branch 'master' into medical-adjustments ... Conflicts: addons/medical/functions/fnc_actionCheckBloodPressure.sqf addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf addons/medical/functions/fnc_actionCheckPulse.sqf addons/medical/functions/fnc_actionCheckPulseLocal.sqf	2015-08-29 23:49:58 +02:00
Glowbal	2fd30ba20c	fixes #2274	2015-08-29 22:57:52 +02:00
Glowbal	602ef690fc	Allow diagnose on torso #1879	2015-08-29 22:54:51 +02:00
Glowbal	ce42f5864f	fix #2155	2015-08-29 22:53:08 +02:00
Glowbal	b291141d11	Should Be a better fix for #2298	2015-08-29 22:51:42 +02:00
Glowbal	183e872f1f	Possible fix for #2298	2015-08-29 22:44:52 +02:00
Michael Braun	657157d767	Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros ... Conflicts: addons/hearing/functions/fnc_moduleHearing.sqf	2015-08-29 22:38:26 +02:00
PabstMirror	321ca815a2	semi-colon	2015-08-29 09:52:28 -05:00
jokoho48	8916b70fe1	Improve some Code	2015-08-29 15:29:02 +02:00
Glowbal	6796b3126d	Staged work on fixing updating base classes for hitpoints	2015-08-29 12:59:28 +02:00
Glowbal	1e08244f21	Removed debug output	2015-08-29 12:59:11 +02:00
Glowbal	1a4736e663	Clean up	2015-08-29 12:01:00 +02:00
Glowbal	1c9e88f213	fixes #1964	2015-08-29 11:58:28 +02:00
Glowbal	d56f3cea81	Added pain and unconsciousness handling for new basic medical code	2015-08-29 11:58:03 +02:00
Glowbal	354e4410d1	Merge pull request #2268 from gienkov/pulse-enhancement ... HR and BP enhancement	2015-08-29 11:47:00 +02:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
Grzegorz	5ad0e192c3	Fix being able to TQ torso	2015-08-26 11:18:54 +02:00
Glowbal	0cfb492916	Fixes and removal of duplicate code	2015-08-26 10:04:51 +02:00
Glowbal	7a48f595be	Merge branch 'basic-medical-test' into medical-adjustments	2015-08-26 09:13:12 +02:00
Glowbal	db96d42f25	Merge branch 'CodeCleanUpMedical' into medical-adjustments	2015-08-26 09:06:27 +02:00
gienkov	6a123020d2	fail to find BP on limbs with TQ on	2015-08-26 08:55:50 +02:00
Glowbal	ad7716a25e	Merge pull request #2233 from gienkov/patch-27 ... Increase "load in bodybag" action time to 15s	2015-08-26 08:36:06 +02:00
Glowbal	a139a3cccc	Merge pull request #2263 from gienkov/patch-30 ... Bandage and tourniquet on adv. medical change proposal	2015-08-26 08:30:59 +02:00
Grzegorz	b8a29bfd44	@jokoho482 suggestion	2015-08-26 03:00:43 +02:00
gienkov	cae5f828fb	run check only on arms	2015-08-26 02:51:05 +02:00
gienkov	c3af5e81e7	fix my error	2015-08-26 02:41:12 +02:00
gienkov	5a9817322b	remove tabs	2015-08-26 02:39:34 +02:00
gienkov	8498589920	pulse zero on limb with TQ on	2015-08-26 02:37:51 +02:00
Felix Wiegand	3098794951	Merge pull request #2194 from NemesisRE/patch-1 ... Changed german strings for aid kit	2015-08-25 23:18:21 +02:00
Grzegorz	5280ded680	Bandage and tourniquet on adv. medical change proposal ... Make bandaging longer as it is not very fast process. Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).	2015-08-25 20:05:05 +02:00
jonpas	5b6429f23e	Made more modules use assignObjectsInList common function	2015-08-24 21:55:48 +02:00
Steven Koeberich	d5a1a99f90	Update stringtable.xml ... corrected spelling	2015-08-23 18:58:13 +02:00
jokoho48	260b048da4	some more Improvements	2015-08-23 14:13:55 +02:00
Grzegorz	33889fa46b	Increase "load in bodybag" action time ... Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).	2015-08-23 00:13:09 +02:00
Grzegorz	07019ed928	Fix stitching action progress bar	2015-08-22 22:20:20 +02:00
jokoho48	fab4c6a67f	fix Spelling Issues	2015-08-22 21:32:36 +02:00
jokoho48	19dd55147a	Code Cleanup Medical Module (Part 4).	2015-08-22 19:47:23 +02:00
jokoho48	2d4ef16429	fix CTD	2015-08-22 18:54:51 +02:00
jokoho48	ff6c8a31be	Code Cleanup Medical Module (Part 3).	2015-08-22 18:33:06 +02:00
jokoho48	10127ed957	Fix Typo	2015-08-22 17:10:19 +02:00
jokoho48	c2d94239a2	Code Cleanup Medical Module (Part 2).	2015-08-22 16:26:53 +02:00
jokoho48	d09ca9ec8b	Code Cleanup Medical Module (Part 1).	2015-08-22 16:25:10 +02:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
gienkov	cc430fc8c2	medical translation	2015-08-21 23:54:01 +02:00
Glowbal	bf8318530e	Merge pull request #2081 from acemod/close-med-menus-distance ... Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-21 14:20:41 +02:00
Glowbal	2f0ed4fba1	Merge pull request #2207 from jonpas/readmes ... Added and Updated README.md files	2015-08-21 14:07:30 +02:00
Glowbal	20918f2c70	Merge pull request #2183 from acemod/treatmentWhileDeployed ... Fix treatment when weapon deployed	2015-08-21 14:04:51 +02:00
SzwedzikPL	a8c11a249d	cargo sup for bodybag and concertina	2015-08-20 21:41:28 +02:00
SilentSpike	33ef60266b	Fix medical CPR code and log message ... Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.	2015-08-19 23:30:13 +01:00
jonpas	de033f0ff2	README.md files added to all modules	2015-08-19 04:18:33 +02:00
Steven Koeberich	b333fe0cd1	Changed german strings for aid kit ... Missed some.	2015-08-17 17:42:03 +02:00
Steven Koeberich	f543cf2897	Changed german strings for aid kit ... The translation for Fielddressing and Aid kit are the same in the german translation which is missleading. Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.	2015-08-17 17:31:40 +02:00
jokoho48	e14c640c6f	Fix Some LandContactPoints ... Fix Positions of some Model	2015-08-17 16:11:23 +02:00
PabstMirror	dd58eef415	Fix double weapon switch for standing treatment	2015-08-16 14:12:26 -05:00
PabstMirror	21f46f4401	#2178 - Fix treatment when weapon deployed	2015-08-16 13:58:58 -05:00
jonpas	5b0168efdb	Fixed Atropine autoinjector display name	2015-08-16 14:14:49 +02:00
PabstMirror	763f793d0e	Localize Catagoires in loadSettingsLocalizedText ... Minor, but allows us to use CSTRINGS in configs for consistancy	2015-08-13 13:20:37 -05:00
Glowbal	17115b8846	test switch to adv medical handleDamage	2015-08-11 20:58:00 +02:00
Glowbal	9c8a03b0b3	fixes #2070 - medication is not translated on activity log	2015-08-09 20:12:31 +02:00
Glowbal	298f64a7bf	fixes #2078 ... 1. Fixed incorrect activity string for tourniquet 2. Fixed incorrect macro usage, should have grabbed variables from medical module.	2015-08-09 20:07:06 +02:00
Glowbal	3cac137851	Fixed #1893 - Menu closes when patient is more as 10 meters away	2015-08-09 09:14:42 +02:00
Glowbal	58fc69c2a6	Updated litter configuration. Closes #2002	2015-08-09 08:59:04 +02:00
PabstMirror	95d88b920e	#2079 - RemoveTourniquet doesn't require any items	2015-08-08 21:25:36 -05:00
Glowbal	493254619c	Merge pull request #2039 from acemod/medical-menu ... Medical menu	2015-08-08 23:11:11 +02:00
Glowbal	696546de5c	Finalized ACE medical menu settings	2015-08-08 20:22:19 +02:00
PabstMirror	c6be0bbb8c	Merge branch 'master' into add-category-optionsmenu ... Conflicts: addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf	2015-08-08 12:39:14 -05:00
Glowbal	bb79feeaf1	Clean up duplicate files	2015-08-08 18:16:11 +02:00
jonpas	8e3a961ee3	Fixed missing string	2015-08-08 18:11:28 +02:00
jonpas	1aecd54fc3	Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common	2015-08-08 18:02:20 +02:00
Glowbal	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	65c06551a5	Merge pull request #1652 from gienkov/patch-22 ... Fix checking vitals anim	2015-08-08 14:32:36 +02:00
Glowbal	be00f7ffe4	Merge pull request #2000 from acemod/treatmentResetWeaponMode ... Treatment reset weapon mode	2015-08-08 14:20:10 +02:00
Glowbal	872c257901	Used the wrong string macro.	2015-08-08 13:21:13 +02:00
Glowbal	e9151d921c	Localized category names for medical settings	2015-08-08 11:52:37 +02:00
Glowbal	d125b9ad9c	Add category to options menu. Initial work.	2015-08-07 21:14:45 +02:00
Glowbal	f21023b4ee	Added logs for quick view and activity view separate from the activity log for medical menu	2015-08-07 19:11:57 +02:00
Glowbal	f21da3ead6	Merge pull request #2026 from acemod/cleanBandages ... Clean bandages if no damage on hitpoint	2015-08-07 15:46:44 +02:00
Glowbal	abaf43be11	Selection restrictions	2015-08-07 00:09:40 +02:00
Glowbal	5ac2972573	Added local event upon successful treatment.	2015-08-06 23:50:44 +02:00
Glowbal	4b5632a8f6	Added categories and missing displayName entries	2015-08-06 23:50:23 +02:00
PabstMirror	e45bd43e5e	CreateLitter / syncEvents performance fixes	2015-08-06 00:28:43 -05:00
PabstMirror	6ab72e905c	#1807 - Clean bandages if no damage on hitpoint	2015-08-05 17:32:00 -05:00
Glowbal	275b0c4300	Merge branch 'release' ... Conflicts: README.md addons/finger/stringtable.xml	2015-08-04 22:29:05 +02:00
Glowbal	43f8c87387	Merge pull request #1972 from jokoho48/MedicalModelUpdate ... Medical Litter model update	2015-08-04 20:06:51 +02:00
PabstMirror	b3741f4036	Capitalization for macro CBA_fnc_addPerFrameHandler	2015-08-04 02:34:38 -05:00
PabstMirror	710135ae3f	Opps	2015-08-03 21:49:16 -05:00
PabstMirror	fa49842c53	#1866 - Restore weapon mode after treatment	2015-08-03 19:57:49 -05:00
KoffeinFlummi	261cd42202	Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge	2015-08-02 17:14:41 +02:00
KoffeinFlummi	8f848947ac	Merge https://github.com/Clon1998/ACE3 into german-merge	2015-08-02 17:11:06 +02:00
jokoho48	ee11622cd5	Fix Position	2015-08-01 16:10:08 +02:00
jokoho48	9d8daf84a4	add New Medical Models	2015-08-01 15:46:25 +02:00
Glowbal	ca2a16af02	fix #1946	2015-07-30 18:21:24 +02:00
Glowbal	a4d5d9cb27	Possible improvement for handling minor levels of pain in advanced medical	2015-07-30 17:43:52 +02:00
Harakhti	d0f91c5ebf	Row 1 ... Not a miracle, but it's something.	2015-07-30 14:40:51 +02:00
SilentSpike	16597515f0	Adding remaining missing English straings	2015-07-28 20:55:22 +01:00
gienkov	5bb1dded4b	Merge remote-tracking branch 'origin' into pl-translation-4	2015-07-27 00:47:54 +02:00
Glowbal	d1809e597c	Removed requirement for the medical dll ... Medical extension is now an optional requirement that improves performance for advanced medical when used.	2015-07-26 20:54:49 +02:00
Glowbal	dfec850aa8	Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs ... addX macro in configs	2015-07-26 08:37:47 +02:00
SzwedzikPL	6258e73290	addX macro in confgis	2015-07-25 21:59:52 +02:00
Glowbal	ea8dc0a5ec	Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant ... Fix for 'Treat at...' option	2015-07-25 21:22:44 +02:00
Glowbal	3a53991ed0	fixed rvmat and texture paths	2015-07-25 21:21:31 +02:00
PabstMirror	40ed985d34	Config Fixes	2015-07-25 12:56:57 -05:00
Jonathan Pereira	5609ec7b6b	Added PT-BR translations ... New PT-BR translations, including the slideshow and spectator module.	2015-07-25 12:56:50 -03:00
gienkov	2f24b240b4	Fix end line marker	2015-07-23 13:59:50 +02:00
gienkov	61fa466a53	Medical and slideshow pl translation	2015-07-23 13:56:54 +02:00
PabstMirror	cbd74d768b	Medical - Don't play *_medic anims at end	2015-07-23 02:43:19 -05:00
Joko	9bdb192c8a	Add New LitterGloves ... Add New Litter/packingbandage Change all Litter Model and Texture to a nomenclature (littergeneric_name)	2015-07-19 15:31:15 +02:00
Glowbal	015fd1afb0	Merge pull request #1864 from jokoho48/TextureUpdate ... Update IV Blood and Plasma Texture	2015-07-17 11:06:49 +02:00
Joko	1b9d02a8a5	Update IV Blood and Plasma Texture	2015-07-17 09:40:43 +02:00
Glowbal	0154dfc51e	Merge pull request #1799 from jokoho48/3DModelUpdate ... Add and Update Some 3D Object and Textures	2015-07-17 08:17:42 +02:00
Joko	c9a47ec053	Add LoDs for IVBag 250/500/1000 ... Add LoDs for Kestrell	2015-07-16 14:41:42 +02:00
Joko	b2b7015b8e	Remove Unessesary Comments in RVMAT	2015-07-15 21:35:30 +02:00
Joko	9aa0285064	Revert LoD Changes	2015-07-15 21:13:05 +02:00
Joko	fd4d4abb73	Move UAV Battery form models to data ... change LoD Distance Fix IVBag names(my issue)	2015-07-15 20:51:06 +02:00
Joko	a72312738e	Add to all Objects a LoD with nothing in for "hiding" Objects in Distance ... Remove Old Earplugs Use 3 Object instead of 9 for IVBag with Using of Model Config	2015-07-15 20:34:35 +02:00
Nicolás Badano	01d8d7957c	Merge pull request #1824 from Legolasindar/master ... Update spanish translation	2015-07-13 15:36:36 -03:00
PabstMirror	d4f70134e6	medical/setUnconscious header	2015-07-12 10:25:00 -05:00
Glowbal	d3bed7aedb	fixed -1 to disable the revive timer does not work	2015-07-09 13:02:48 +02:00
Ivan Navarro Cabello	78529af60c	Update spanish translation	2015-07-08 20:57:46 +02:00
SzwedzikPL	defc82694b	Fix for 'Treat at...' option	2015-07-06 21:30:49 +02:00
Joko	fa900452ea	Add DAGR (by Blackpixxel) ... Add QuikClot to Medical (by Blackpixxel) Add QuikClot Litter (by Blackpixxel) Update Blackpixxel at Author Fix IRStrobe Texture Path	2015-07-05 22:21:17 +02:00
Joko	0c099dc4d1	Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues) ... Add PaxJaromeMalues to AUTHORS	2015-07-04 22:50:32 +02:00
ProfessorCZ	89a9218e59	CZ Translation - Update	2015-07-04 15:56:00 +02:00
Clon1998	c61a0f03cd	Fixed german translation. ... Fixed german translation for Key STR_ACE_Medical_AssignMedicVehicle_EnableList_Description	2015-07-04 09:43:42 +02:00
Glowbal	57c4bc453a	Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect ... disable pain effect in zeus camera	2015-07-03 23:20:33 +02:00
Glowbal	44de95ea81	Merge pull request #1790 from acemod/medicalImprovements ... Medical improvements	2015-07-03 22:21:20 +02:00
Glowbal	fd649aee38	Changed default value for surgical kit. Should be use anytime	2015-07-03 22:17:31 +02:00
Glowbal	9edf1b1adf	Implemented use conditions for PAK and SurgicalKit ... It is now possible to only have a treatment action show up for stable (not bleeding) patients	2015-07-03 22:16:18 +02:00
Glowbal	07303633e4	Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing ... Fix vanilla damage effects	2015-07-03 21:41:26 +02:00
gienkov	70862c5de9	PL translation	2015-07-02 23:55:26 +02:00
SzwedzikPL	13999fdd31	finddisplay into curatorcamera	2015-07-02 19:36:34 +02:00
SzwedzikPL	c2e4ee431f	no pain effect in zeus camera	2015-07-02 13:56:56 +02:00
ToasterBR	f4a51d57ef	Translation to Brazilian Portuguese (PT-BR) ... Made all remaining translations, including new ones like the sitting module, for example.	2015-06-27 15:48:39 -03:00
ulteq	241e8acdd9	Merge pull request #1541 from jonpas/sitting ... Sitting	2015-06-26 21:34:34 +02:00
Glowbal	e153e47bb2	Disabled litter on treatment failure. #1403 ... We give back the items, so litter does not make sense at the moment. In the future we need to expand this with conditions for success/failure.	2015-06-20 12:54:00 +02:00
Glowbal	9e00fc479b	CPR local is now also only executed when the target is still alive. ... Otherwise it's quite useless	2015-06-20 12:51:42 +02:00
Glowbal	c4283404e8	Changed CPR to be available for all unconscious units ... Including dead	2015-06-20 12:51:01 +02:00
Glowbal	ea0be1f563	Only execute the local handling of CPR when in a valid state	2015-06-20 12:46:26 +02:00
Glowbal	385baf1331	Using CPR while in revive state will extend the life timer	2015-06-20 12:44:52 +02:00
Glowbal	9795647d9c	While in revive state, ensure vitals are never above 0 for adv medical	2015-06-20 12:44:29 +02:00
Glowbal	3f5a050745	Fixed #1693	2015-06-20 12:38:12 +02:00
Glowbal	c3e2d1bf9c	Removed always unconscious for basic medical	2015-06-20 12:23:40 +02:00
Glowbal	5887c59c05	Made fix properly for advanced medical	2015-06-19 23:03:31 +02:00
Glowbal	300a33ea0a	Initial work	2015-06-19 22:53:25 +02:00
Grzegorz	1de569656d	Fix checking vitals anim ... It uses animations that don't match at all what you are doing anyway so I think it's better to just disable anim for that actions which are: * Checking pulse * Checking BP * Checking response	2015-06-17 14:58:35 +02:00
ulteq	82d80359d1	Fixes: https://github.com/acemod/ACE3/issues/1646	2015-06-16 21:57:12 +02:00
Glowbal	f8aa9a3171	Merge pull request #1621 from acemod/hrIncrease ... Medical - change hrIncrease random min/max	2015-06-15 10:42:43 +02:00
Ivan Navarro Cabello	76f7962dac	Updated spanish stringatable ... Updated spanish stringatable for (Common, Medical, Optionsmenu, Tacticalladder).	2015-06-14 13:52:55 +02:00
PabstMirror	1c5788baab	Medical - change hrIncrease random min/max	2015-06-14 03:54:50 -05:00
Glowbal	91b54bfc3a	Adds a back up function in sqf to assign open wounds.	2015-06-13 23:20:01 +02:00
ViperMaul	1322da5537	Merge pull request #1587 from acemod/fixVehicleUnconcious ... fix animation and consistently unload units from vehicle	2015-06-13 12:44:34 -07:00
jonpas	29ce8f635e	Merge branch 'master' into sitting ... Conflicts: addons/kestrel4500/CfgVehicles.hpp addons/microdagr/CfgVehicles.hpp	2015-06-13 21:43:42 +02:00
ulteq	c459a80bcb	Merge pull request #1613 from ProfessorCZ/master ... CZ - Translation (medical, tacticalladder)	2015-06-13 20:48:34 +02:00
Glowbal	5013254769	Merge pull request #1530 from legman/akalegman_zeus_unconscious ... Fixed Zeus Unconscious	2015-06-13 20:48:18 +02:00