Glowbal
565da090bc
Add missing bracket
2016-07-15 11:53:57 +02:00
Glowbal
ab2075c328
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/CfgEden.hpp
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_serverRemoveBody.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
2016-07-15 11:50:58 +02:00
Glowbal
c8a54fd090
Merge branch 'release'
2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b
Fix cached call events
2016-07-14 13:06:45 -05:00
Glowbal
ee8e03a1ae
Merge pull request #3916 from acemod/merge-basic-and-advanced
...
Merge basic and advanced injury systems
2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3
Merge branch 'release'
2016-07-11 23:42:03 +02:00
Glowbal
d0c30577af
Remove usage of setUnconscious
2016-07-11 19:18:40 +02:00
Glowbal
f86d8d113c
Merge branch 'release'
2016-07-09 11:36:49 +02:00
Glowbal
da661afe9b
Improve syntax
2016-07-07 17:22:08 +02:00
Glowbal
7157fcf420
Clean up unconscious and revive states
2016-07-07 12:57:21 +02:00
Glowbal
2daee60d0c
Add handle revive and Unconscious states
2016-07-07 12:04:26 +02:00
Glowbal
d0236a007a
Work done on medical states
2016-07-07 11:46:55 +02:00
PabstMirror
450b8dfedb
Fix order of revive loop
...
Fix #4035
Revive loop was killing heartrate before it exited
2016-07-06 00:54:51 -05:00
Glowbal
e8eb729e04
Merge medical core and medical state. Add working version of the state machine, re-add sounds
2016-07-02 16:34:28 +02:00
Glowbal
3aa88c80bf
Add first step in medical rewrite
...
Split up medical core and medical damage. Move out all other functionality
2016-06-30 17:33:29 +02:00
Glowbal
8c331937d0
Merge branch 'merge-basic-and-advanced' into medical-split-treatment
...
Conflicts:
addons/medical/ACE_Medical_Treatments.hpp
addons/medical/config.cpp
addons/medical_treatment/functions/fnc_addToTriageCard.sqf
2016-06-30 11:41:03 +02:00
Glowbal
e3f96b6594
Merge branch 'master' into merge-basic-and-advanced
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
2016-06-30 11:27:51 +02:00
Glowbal
cd08e00c71
Merge pull request #3962 from acemod/dogtags
...
Dogtags
2016-06-29 22:19:02 +02:00
Glowbal
1d66d46501
Fix damaged array not being overwritten.
...
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
2016-06-27 19:55:00 +02:00
PabstMirror
10a19b59e7
Swich EFUNC(common,waitAndExecute) to CBA
2016-06-26 22:18:53 -05:00
esteldunedain
18f09b9310
Rename events:
...
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo -> ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess -> ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
2016-06-24 10:45:13 -03:00
PabstMirror
3972504d4a
Add dogtag actions to body bags
2016-06-21 12:13:32 -05:00
jonpas
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
Glowbal
a8831a0d16
Change split medical in two components
...
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
2016-06-13 17:00:56 +02:00
Glowbal
295ad3b037
Merge branch 'medical-impr' into merge-basic-and-advanced
2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0
Clean up medical function private declares
2016-06-13 14:27:43 +02:00
Glowbal
58f43f8a51
Remove unneeded and deprecated functions from medical
2016-06-13 12:24:28 +02:00
Glowbal
6657bde921
Change basic medical to use advanced medical injury system
2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009
Change clean up privates in handleDamage code
2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65
Change formatting and private keywords in medical
2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7
Change minor clean up of handleUnitVitals
2016-06-13 02:11:21 +02:00
Glowbal
7f9257716e
Merge pull request #2331 from acemod/323bloodyoverlay
...
remove BI blood overlay
2016-06-11 20:49:54 +02:00
PabstMirror
dc6d5f1367
Temp fix for change to handleDamage in dev branch
...
Fix #3892
2016-06-09 21:26:50 -05:00
jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
commy2
a61e4b3a4e
remove BI blood overlay
2016-06-06 14:14:45 +02:00
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01:00
Glowbal
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156
Fix medical related events
2016-06-03 20:22:34 +02:00
jonpas
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e
Merge pull request #3516 from acemod/cbamissiontime
...
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
jonpas
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
commy2
d93132dac8
more replacing
2016-05-18 11:57:40 +02:00
