381 Commits

Author	SHA1	Message	Date
KoffeinFlummi	d7b961043b	Remove animation reset before falling unconscious ... This caused the unit to briefly move to the default animation, which looked shite.	2015-04-24 22:20:16 +02:00
KoffeinFlummi	d1c95ba8a1	Add maximum unconsciousness time option	2015-04-23 11:31:27 +02:00
KoffeinFlummi	84e1937515	Add damage threshold to basic	2015-04-22 23:50:37 +02:00
KoffeinFlummi	d10f4d543d	Enable unit specific bleeding coefficient	2015-04-22 22:38:48 +02:00
KoffeinFlummi	74ca85cbd9	Change getBloodLoss to expect an array	2015-04-22 22:36:41 +02:00
KoffeinFlummi	f6eeb5e3ba	Add pain coefficient	2015-04-22 22:29:31 +02:00
Glowbal	1df42b17c2	close all dialogs	2015-04-20 22:22:09 +02:00
Glowbal	f7719f0e0a	tab	2015-04-20 22:08:31 +02:00
Glowbal	842bfe0b98	enabled advanced wounds setting	2015-04-20 22:00:11 +02:00
Glowbal	8be7ccaab7	setting for moving unit from group on unconscious	2015-04-20 21:37:30 +02:00
Glowbal	17899db086	added some missing privates	2015-04-19 19:49:56 +02:00
Glowbal	5e82c51926	Merge branch 'master' into medicalFixes	2015-04-19 18:45:07 +02:00
jaynus	aad8d6b785	Fixed: max litter scalar array, have internal values.	2015-04-19 09:04:42 -07:00
Glowbal	f6bbeb6bd6	switched back to old init method	2015-04-19 17:28:47 +02:00
Glowbal	8a7b3a1b33	Removed damage thresholds from basic medical	2015-04-19 13:08:28 +02:00
Glowbal	b71ac1485d	Merge branch 'master' into medicalFixes	2015-04-19 12:06:54 +02:00
jaynus	ca74ce721d	Use cleanup settings, and force server TTL on the events.	2015-04-18 11:48:44 -07:00
jaynus	e54c68f7f9	handle cleanup	2015-04-18 11:37:06 -07:00
jaynus	852b4df61d	Settings changes. createVehicleLocal derp.	2015-04-18 11:16:18 -07:00
jaynus	c438d9e790	Merge remote-tracking branch 'origin/master' into localMedicalGarbage	2015-04-18 11:12:22 -07:00
Glowbal	22456a4301	use pain instead	2015-04-18 19:49:29 +02:00
jaynus	f31e3c1fd4	litter simulation createVehicleLocal /w temporal network sync.	2015-04-18 08:31:03 -07:00
jaynus	c952a97de8	Revert "synced events implemented into litter." ... This reverts commit 32df4a2adc.	2015-04-17 19:38:05 -07:00
jaynus	32df4a2adc	synced events implemented into litter.	2015-04-17 19:33:07 -07:00
Glowbal	d1a09ae7fc	fixed vehicle crashes for adv	2015-04-17 23:15:41 +02:00
Glowbal	bc4d102d08	changed variable initialization - everything is now done local	2015-04-17 22:43:31 +02:00
Glowbal	f5effca216	fixed handleDamage basic	2015-04-17 22:21:15 +02:00
Glowbal	6d18e484c1	Cache condition for target instead of caller	2015-04-17 22:02:43 +02:00
Glowbal	fa7bb5f9c6	Added unconscious state check	2015-04-17 21:28:47 +02:00
Glowbal	008c36ac76	fixes #699	2015-04-17 21:27:57 +02:00
Glowbal	eb731b1169	fixes #653	2015-04-17 21:07:09 +02:00
Glowbal	31bc09a9a3	fixed AI standing up before being killed ... Doesn't matter if we enable AI again on dead units	2015-04-17 21:06:30 +02:00
Glowbal	9b4435827e	Added setting for unconscious animations on treatment	2015-04-17 20:51:57 +02:00
Glowbal	80139521bc	fixes #691	2015-04-17 20:49:24 +02:00
Glowbal	b333e6e662	Keep units longer unconscious, instead of quickly fading in/out	2015-04-17 20:40:24 +02:00
Glowbal	847ee7e229	Moved unconscious event, so it won't conflict in case the unit is still being carried	2015-04-17 20:38:02 +02:00
Glowbal	8b7e46c45f	fixes #656	2015-04-17 20:26:28 +02:00
Glowbal	c86be12668	fixes #599	2015-04-17 20:24:05 +02:00
Glowbal	111a350a84	Merge branch 'master' into advMedicalEventSync	2015-04-17 20:11:53 +02:00
PabstMirror	6e077de829	Medical - Use default value instead of 0 for getVar ... #683 - should prevent people getting knocked out from any damage source if the variables are undefined	2015-04-17 12:13:23 -05:00
Glowbal	59ae4623ff	Derp	2015-04-16 00:17:17 +02:00
Glowbal	0f4b7d0977	fixes #347 ... Please??	2015-04-16 00:14:05 +02:00
Glowbal	c88479d54d	staged work	2015-04-15 19:45:42 +02:00
PabstMirror	a36739c697	Merge pull request #418 from acemod/flashbangTweaks ... Flashbang tweaks	2015-04-14 23:23:15 -05:00
Glowbal	af255604ac	Switched to event based sync system for open wounds	2015-04-14 21:17:36 +02:00
KoffeinFlummi	71b19b4621	Remove duplicate bleeding code	2015-04-14 20:40:38 +02:00
KoffeinFlummi	ba377dfd3a	Show seperate message for "scratches"; localize	2015-04-14 20:40:17 +02:00
KoffeinFlummi	c6118901b4	Merge branch 'master' into basic-medical-tweaks	2015-04-14 20:35:17 +02:00
KoffeinFlummi	7ca36cdb65	Always show wounds, even for very low damage	2015-04-14 20:28:19 +02:00
PabstMirror	bf3e3d3b64	#542 - ACE_fakeWeapon not found	2015-04-13 03:46:42 -05:00