Commit Graph

1053 Commits

Author SHA1 Message Date
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
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
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
d93132dac8 more replacing 2016-05-18 11:57:40 +02:00
da70854568 manual merge 2016-05-18 11:48:27 +02:00
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
65ccf66d00 Fixed redundant privates in setCardiacArrest 2016-04-18 15:23:04 +02:00
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
bcde9f8ed6 Filter minor falling damage to non-leg hitpoints 2016-03-28 01:15:58 -05:00
3232654e13 Close #3565 -Fix spelling of local var _woundEffectiveness 2016-03-08 11:02:54 -06:00
e3deebff7e Fix empty callback for hr adjustment
Fix #3526
Same issue as #3384
2016-03-03 13:23:53 -06:00
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
9e682253f3 Move the dead body cleanup PFH to a loop using waitAndExecute 2016-02-28 23:33:51 -03:00
90a54397ae Move the litter cleanup PFH to a loop using waitAndExecute 2016-02-28 23:20:26 -03:00
4b702f68df Make loops non public 2016-02-28 23:10:15 -03:00
94e8bee348 Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop 2016-02-28 23:08:25 -03:00
12895e7983 Remove unneeded parameter 2016-02-28 22:58:09 -03:00
0e82cdfe82 Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance. 2016-02-28 22:50:04 -03:00
21d4939abb Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10 2016-02-28 22:08:59 -03:00
35e13d5357 Fixes 2016-02-28 20:55:05 -03:00
bbb84ec7d1 Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities 2016-02-28 20:50:28 -03:00
085860c770 Restore addToInjuredCollection as a deprecated function 2016-02-28 20:32:02 -03:00
bed51ac8a4 Fix waitAndExecute syntax 2016-02-28 20:26:05 -03:00
3bbabac2d7 Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance. 2016-02-28 20:12:56 -03:00
e0a65aa543 Add registering last damage source 2016-02-26 22:58:49 +01:00
b2d2bec2cf Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv
# Conflicts:
#	addons/medical/functions/fnc_setUnconscious.sqf
2016-02-23 15:31:38 +01:00
2467fa7b0c Fix empty callbacks in medical/repair 2016-02-21 11:34:25 -06:00
3fbd6cff18 Merge pull request #3368 from acemod/fixNils
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
7d063d4dee Merge branch 'master' into medical-focus-feature
Conflicts:
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
2930fab6c6 Merge pull request #3354 from acemod/playerBodybags
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
4f10d551d6 Merge pull request #2949 from gienkov/fixWoundCount
ceil number of wounds
2016-02-20 16:56:17 +01:00
dffcbc7650 Cleanup events 2016-02-19 15:45:37 -06:00
44b526ab6d bodybag - hide player corpse and delete later
Fix #1301
2016-02-19 15:41:13 -06:00
95532ea521 Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
88eae19646 Replace execRemoteFnc in ace_medical 2016-02-17 22:54:43 -03:00
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
26cb6bd6a3 Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
40396fc69e Remove debug 2016-02-17 09:37:08 -06:00
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
5c9dfd7dc5 Handle enemy causing veh explode, fix revive unload
Fix #3269
2016-02-15 22:23:37 -06:00
9441b548be Fix vehicle crashes not being fatal to non-drivers
Fix #3306
2016-02-15 17:11:04 -06:00
0a226b5ee9 Update fnc_treatment_success.sqf
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
e754c89c73 Remove non functional event driven handleDamage 2016-02-07 13:18:19 +01:00