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
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
ac007e6995
replace more map with apply
2016-02-06 12:08:04 +01:00
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06:00
336184dfaa
Change medication removal from array
2016-02-04 10:00:33 -06:00
3cc10a27ce
Tourniquets block medication until released
...
Close #2704
2016-02-03 14:40:26 -06:00
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
7de1a7bc6c
add initial implementation of drowning and collision damage handling
2016-01-17 13:21:18 +01:00
209d10065b
Fix missing event log entries #3134
2016-01-17 12:28:37 +01:00
6e42a10d47
Add selectionDamage implementation
2016-01-17 12:28:08 +01:00
ee9a620a63
Merge branch '340handledamage' into medical-focus-feature
2016-01-16 22:03:28 +01:00
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
daf2fc2669
remove ccp issue in settings
...
prevent setCaptive if unit is wake up
2016-01-06 18:01:24 +01:00
6d49bbda28
add delay to Unconsciousness Captivity(posible fix for #3121 )
2016-01-06 17:46:59 +01:00
c042703786
Merge branch 'release'
2016-01-05 22:55:34 +01:00
7eaa55f9df
Merge pull request #3022 from acemod/bodybagevent
...
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
e9be05209a
Fix litter for adv - Add bloody p3d for Pack/qClot
...
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
1132efaf48
ceil number of wounds
2015-12-06 02:57:21 +01:00
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00
