PabstMirror ddf72d5878 Merge branch 'master' into medical-rewrite ...

Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/CfgWeapons.hpp
	addons/medical/data/model.cfg
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/stringtable.xml

2017-09-23 11:25:58 -05:00

..

data

Added missing semicolon (#5487)

2017-09-10 14:44:26 +02:00

functions

Underwater actions support (#4984)

2017-08-22 13:30:56 -05:00

ui

Cleanup moved functions

2016-12-09 21:27:42 -06:00

$PBOPREFIX$

Add first step in medical rewrite

2016-06-30 17:33:29 +02:00

ACE_Medical_StateMachine.hpp

[Medical Rewrite] Adding respawn compatibility (#5020)

2017-06-17 18:28:16 -05:00

ACE_Settings.hpp

Split setUnconscious func, add spontaneousWakeUpChance setting (#5114)

2017-06-05 11:42:46 -05:00

CfgEden.hpp

Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905)

2017-02-18 12:27:36 -06:00

CfgEventHandlers.hpp

[Medical Rewrite] Adding respawn compatibility (#5020)

2017-06-17 18:28:16 -05:00

CfgFactionClasses.hpp

Add stringtables and items

2016-07-15 12:21:56 +02:00

CfgVehicles.hpp

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

CfgWeapons.hpp

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

config.cpp

Moved heart beat sounds to medical ui

2017-01-29 21:59:24 +01:00

script_component.hpp

Clenaup / Debug

2017-04-26 10:16:09 -05:00

script_macros_config.hpp

use common header file for medical components

2016-10-06 22:40:36 +02:00

script_macros_medical.hpp

Add load,unload and radial actions (#5270)

2017-06-15 14:35:33 -05:00

stringtable.xml

Merge branch 'master' into medical-rewrite

2017-09-23 11:25:58 -05:00

XEH_postInit.sqf

More debug monitor stuff

2017-04-29 12:58:35 -05:00

XEH_preInit.sqf

Reload medical configs into extension on save load (#4941)

2017-03-08 19:33:28 +01:00

XEH_PREP.hpp

[Medical Rewrite] Adding respawn compatibility (#5020)

2017-06-17 18:28:16 -05:00

XEH_preStart.sqf

precompile on game start

2016-02-22 15:20:36 +01:00