Glowbal 0c43c83b3d Merge branch 'master' ... Conflicts: addons/medical/ACE_Settings.hpp addons/medical/XEH_postInit.sqf addons/medical/XEH_preInit.sqf addons/medical/functions/fnc_actionDiagnose.sqf addons/medical/functions/fnc_actionLoadUnit.sqf addons/medical/functions/fnc_addDamageToUnit.sqf addons/medical/functions/fnc_createLitter.sqf addons/medical/functions/fnc_displayPatientInformation.sqf addons/medical/functions/fnc_handleCreateLitter.sqf addons/medical/functions/fnc_handleDamage.sqf addons/medical/functions/fnc_handleDamage_advanced.sqf addons/medical/functions/fnc_handleDamage_airway.sqf addons/medical/functions/fnc_handleDamage_caching.sqf addons/medical/functions/fnc_handleDamage_internalInjuries.sqf addons/medical/functions/fnc_handleDamage_wounds.sqf addons/medical/functions/fnc_isBeingCarried.sqf addons/medical/functions/fnc_isBeingDragged.sqf addons/medical/functions/fnc_litterCleanupLoop.sqf addons/medical/functions/fnc_moduleAssignMedicRoles.sqf addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf addons/medical/functions/fnc_setCardiacArrest.sqf addons/medical/functions/fnc_showBloodEffect.sqf addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf addons/medical/functions/fnc_treatmentBasic_epipen.sqf addons/medical/functions/fnc_treatmentIV.sqf addons/medical/functions/fnc_treatmentIVLocal.sqf		2016-09-18 11:51:21 +02:00
..
data	Add stringtables and items	2016-07-15 12:21:56 +02:00
functions	Merge branch 'master'	2016-09-18 11:51:21 +02:00
sounds	Merge medical core and medical state. Add working version of the state machine, re-add sounds	2016-07-02 16:34:28 +02:00
ui	Use GVAR where applicable	2016-07-20 07:15:18 +03:00
$PBOPREFIX$	Add first step in medical rewrite	2016-06-30 17:33:29 +02:00
ACE_Medical_Injuries.hpp	Change injuries include to ACE_Medical_Injuries	2016-07-15 12:10:18 +02:00
ACE_Medical_StateMachine.hpp	Clean up unconscious and revive states	2016-07-07 12:57:21 +02:00
ACE_Settings.hpp	Use createSimpleObject for medical litter	2016-08-01 16:20:13 -05:00
CfgEden.hpp	Fix 3den attribute layout for 1.62	2016-07-12 17:54:16 +02:00
CfgEventHandlers.hpp	Add first step in medical rewrite	2016-06-30 17:33:29 +02:00
CfgFactionClasses.hpp	Add stringtables and items	2016-07-15 12:21:56 +02:00
CfgSounds.hpp	Merge medical core and medical state. Add working version of the state machine, re-add sounds	2016-07-02 16:34:28 +02:00
CfgVehicles.hpp	Merge branch 'master'	2016-09-18 11:51:21 +02:00
CfgWeapons.hpp	Add stringtables and items	2016-07-15 12:21:56 +02:00
config.cpp	Add stringtables and items	2016-07-15 12:21:56 +02:00
script_component.hpp	Add first step in medical rewrite	2016-06-30 17:33:29 +02:00
stringtable.xml	Merge branch 'master'	2016-09-18 11:51:21 +02:00
XEH_postInit.sqf	Merge branch 'master'	2016-09-18 11:51:21 +02:00
XEH_preInit.sqf	Increase blood bag flow rate for basic medical (#4306)	2016-09-01 12:46:08 +02:00
XEH_PREP.hpp	Merge medical core and medical state. Add working version of the state machine, re-add sounds	2016-07-02 16:34:28 +02:00
XEH_preStart.sqf	precompile on game start	2016-02-22 15:20:36 +01:00