7581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Glowbal	9c7f7429d1	Merge pull request #2350 from jonpas/cargoHideActionOnLocked ... Prevent Cargo opening if vehicle is locked	2015-09-05 13:09:14 +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	c8a7b94777	Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur ... Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:53:04 +02:00
Glowbal	d617fba6c6	Merge branch 'master' into medical-adjustments2	2015-09-05 12:51:18 +02:00
Glowbal	c828544d02	Added init stacking	2015-09-05 12:50:32 +02:00
jokoho48	c70c9cdee6	Add Screen Blur and Blackout for Medical Menu by Interact_menu setting	2015-09-05 12:49:23 +02:00
Glowbal	23d45c53cf	Merge branch 'master' into medical-adjustments2	2015-09-05 12:47: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	25a75b9f69	fixed incorrect macro usage	2015-09-05 12:35:48 +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	883b9ab545	Removed blur screen for medical menu #2069	2015-09-05 11:58:34 +02:00
Glowbal	85dc59d66c	Fixed: should only display "no injuries" when there are no injuries. Not the other way around	2015-09-05 11:57:41 +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
Glowbal	a02f95ae06	Merge pull request #2355 from acemod/settingInitDelayFunctions ... Setting init delay functions	2015-09-05 11:01:44 +02:00
[OMCB]kaban	085b60bddd	Added some name to AUTHORS.txt	2015-09-05 05:45:25 +03:00
[OMCB]kaban	cc9a566c15	Fix due to review	2015-09-05 05:23:27 +03:00
[OMCB]kaban	298b475433	Fix due to review	2015-09-05 05:15:29 +03:00
[OMCB]kaban	ce49f752f1	Fix due to review	2015-09-05 05:14:34 +03:00
[OMCB]kaban	1bad390dba	Fix due to review	2015-09-05 05:09:47 +03:00
[OMCB]kaban	8ef007b727	Fix due to review	2015-09-05 05:08:16 +03:00
[OMCB]kaban	6c48a4a0de	Fix due to review	2015-09-05 05:07:18 +03:00
[OMCB]kaban	85b0127f56	Fix due to review	2015-09-05 05:00:18 +03:00
[OMCB]kaban	6f7437bb80	Fix due to review	2015-09-05 04:57:07 +03:00
[OMCB]kaban	f69b94af98	Fix due to review	2015-09-05 04:53:30 +03:00
[OMCB]kaban	421f7bc6f8	Fix due to review	2015-09-05 04:38:39 +03:00
[OMCB]kaban	9f416b796c	Fix due ti review	2015-09-05 02:07:26 +03: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
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
bux578	9e1ae58f4f	fix restore gear	2015-09-03 18:17:53 +02:00
PabstMirror	f63e652636	Merge pull request #2334 from acemod/mapToolsAspectRatio ... MapTools - Handle Bad Aspect Ratio	2015-09-03 10:44:34 -05: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