662 Commits

Author	SHA1	Message	Date
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
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	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	d56f3cea81	Added pain and unconsciousness handling for new basic medical code	2015-08-29 11:58:03 +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
gienkov	6a123020d2	fail to find BP on limbs with TQ on	2015-08-26 08:55:50 +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
jokoho48	260b048da4	some more Improvements	2015-08-23 14:13:55 +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	d09ca9ec8b	Code Cleanup Medical Module (Part 1).	2015-08-22 16:25:10 +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	20918f2c70	Merge pull request #2183 from acemod/treatmentWhileDeployed ... Fix treatment when weapon deployed	2015-08-21 14:04:51 +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
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
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	364e0455ee	Merge branch 'master' into medical-menu	2015-08-08 17:55:43 +02:00
Glowbal	be00f7ffe4	Merge pull request #2000 from acemod/treatmentResetWeaponMode ... Treatment reset weapon mode	2015-08-08 14:20:10 +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
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
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
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
PabstMirror	cbd74d768b	Medical - Don't play *_medic anims at end	2015-07-23 02:43:19 -05: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
Glowbal	44de95ea81	Merge pull request #1790 from acemod/medicalImprovements ... Medical improvements	2015-07-03 22:21:20 +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	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	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
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
Glowbal	5013254769	Merge pull request #1530 from legman/akalegman_zeus_unconscious ... Fixed Zeus Unconscious	2015-06-13 20:48:18 +02:00
Glowbal	1c066a0b3f	Merge pull request #1586 from acemod/dynamicPAKtreatmentTime ... PAK treatment time based on total amount of damage.	2015-06-13 20:14:57 +02:00
ulteq	6d6c3a4285	Fixed function header	2015-06-13 19:17:26 +02:00
Glowbal	e0bb3c0a4e	Merge pull request #1602 from acemod/medicalFallingFix2 ... [Adv. Medical] Improved falling damage	2015-06-13 13:39:22 +02:00
Glowbal	ce908f0fb3	Merge pull request #1579 from acemod/medicalModuleOptions ... [Adv. Medical] New module options	2015-06-13 13:37:02 +02:00
ulteq	1c4566984f	Removed debug output	2015-06-13 12:13:58 +02:00
ulteq	84d20f9794	Further improved the handling of falling damage: ... * Makes sure _projectile is always "falling" * Enables the creation of wounds in multiple body parts at once * Caches the initial impact velocity for later damage calculation * Adjusts the maxDamage value of Large Abrasions	2015-06-13 11:53:30 +02:00
ViperMaul	1c0811aa31	Change from globalEvent to targetEvent ... #1575 and #1577	2015-06-12 16:56:13 -07:00
ulteq	604cd122d3	Experiment	2015-06-12 13:54:52 +02:00
ulteq	6ac2ca9208	Fixes _projectile not being updated	2015-06-12 11:48:49 +02:00
ulteq	46a73f3177	Added a function to calculate the PAK treatmentTime	2015-06-12 11:42:49 +02:00
ViperMaul	072f2cc3a7	fix animation and consistently unload units from vehicle ... #1575 and #1577	2015-06-11 15:56:11 -07:00
ulteq	be6d72606a	Pain is always suppressed again	2015-06-11 22:35:50 +02:00
ulteq	eef7c1295a	Added new adv. medical module option 'painIsOnlySuppressed'	2015-06-11 17:36:18 +02:00
ulteq	0c40c1b439	Added Adv. Medical module option 'healHitPointAfterAdvBandage': ... * Changed the default value to '0'	2015-06-11 15:30:39 +02:00
Glowbal	9d82b9a1f3	Merge pull request #1550 from acemod/medicalVanillaDamageFix ... Attempt to fix #1465 and #1354	2015-06-11 10:25:50 +02:00
Glowbal	b6ed944123	Merge pull request #1563 from acemod/medicalCleanup ... Cleanup	2015-06-11 10:25:28 +02:00
AKALegman	5431ab5e01	fixed conflicts	2015-06-10 20:03:00 +01:00
ulteq	8a7d3e9ede	handleDamage_advanced cleanup	2015-06-10 17:10:09 +02:00
ulteq	91ce327580	Newline	2015-06-10 17:07:35 +02:00
ulteq	caae62b2af	Reverted handleDamage_advanced	2015-06-10 17:07:00 +02:00
ulteq	245151d8c2	Removed spaces	2015-06-10 17:03:09 +02:00
ulteq	1c2c7ef8d7	Fixed empty selectionNames in vehicle crashes	2015-06-10 17:02:14 +02:00
ulteq	9336e7c9e1	[WIP] Various handleDamage_caching fixes	2015-06-10 16:51:46 +02:00
ulteq	772a1e508b	Cleanup	2015-06-10 16:07:09 +02:00
ulteq	0661d25ae3	Removed debug output	2015-06-10 16:06:46 +02:00
ulteq	0f6c93852c	Fixed handling of falling damage	2015-06-10 12:59:55 +02:00
ulteq	8bb3dbbaf6	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix	2015-06-10 12:59:11 +02:00
ulteq	7318aae629	Cleanup	2015-06-10 12:47:22 +02:00
Glowbal	efa9cf4709	Fix handleDamage caching return value ... Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.	2015-06-10 12:21:06 +02:00
PabstMirror	e2890b0699	#1473 - Fix Medical Log Localization ... also swap some common EFUNCs	2015-06-09 17:30:02 -05:00
ulteq	d454a2ccfc	Attempt to fix #1465 and #1354	2015-06-09 15:46:00 +02:00
AKALegman	1ae8e29ac2	updated isPlayer v2	2015-06-08 19:12:16 +01:00
AKALegman	96fccbedf9	updated isPlayer	2015-06-08 11:09:49 +01:00
Glowbal	610f74d9d6	Merge pull request #1523 from AgentRev/onSetDead ... Added "medical_onSetDead" local event in fnc_setDead.sqf	2015-06-07 23:58:22 +02:00
AgentRev	f7007b4175	Fixed "medical_onSetDead" event	2015-06-07 17:52:42 -04:00
AKALegman	d3eae58237	Fixed Zeus Unconscious	2015-06-07 12:17:52 +01:00
AgentRev	4a416a12a2	Added "medical_onSetDead" local event in fnc_setDead.sqf	2015-06-05 22:03:27 -04:00