ea0be1f563
Only execute the local handling of CPR when in a valid state
2015-06-20 12:46:26 +02:00
385baf1331
Using CPR while in revive state will extend the life timer
2015-06-20 12:44:52 +02:00
9795647d9c
While in revive state, ensure vitals are never above 0 for adv medical
2015-06-20 12:44:29 +02:00
3f5a050745
Fixed #1693
2015-06-20 12:38:12 +02:00
c3e2d1bf9c
Removed always unconscious for basic medical
2015-06-20 12:23:40 +02:00
1c5788baab
Medical - change hrIncrease random min/max
2015-06-14 03:54:50 -05:00
91b54bfc3a
Adds a back up function in sqf to assign open wounds.
2015-06-13 23:20:01 +02:00
1322da5537
Merge pull request #1587 from acemod/fixVehicleUnconcious
...
fix animation and consistently unload units from vehicle
2015-06-13 12:44:34 -07:00
5013254769
Merge pull request #1530 from legman/akalegman_zeus_unconscious
...
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
1c066a0b3f
Merge pull request #1586 from acemod/dynamicPAKtreatmentTime
...
PAK treatment time based on total amount of damage.
2015-06-13 20:14:57 +02:00
6d6c3a4285
Fixed function header
2015-06-13 19:17:26 +02:00
e0bb3c0a4e
Merge pull request #1602 from acemod/medicalFallingFix2
...
[Adv. Medical] Improved falling damage
2015-06-13 13:39:22 +02:00
ce908f0fb3
Merge pull request #1579 from acemod/medicalModuleOptions
...
[Adv. Medical] New module options
2015-06-13 13:37:02 +02:00
1c4566984f
Removed debug output
2015-06-13 12:13:58 +02:00
84d20f9794
Further improved the handling of falling damage:
...
* Makes sure _projectile is always "falling"
* Enables the creation of wounds in multiple body parts at once
* Caches the initial impact velocity for later damage calculation
* Adjusts the maxDamage value of Large Abrasions
2015-06-13 11:53:30 +02:00
1c0811aa31
Change from globalEvent to targetEvent
...
#1575 and #1577
2015-06-12 16:56:13 -07:00
604cd122d3
Experiment
2015-06-12 13:54:52 +02:00
6ac2ca9208
Fixes _projectile not being updated
2015-06-12 11:48:49 +02:00
46a73f3177
Added a function to calculate the PAK treatmentTime
2015-06-12 11:42:49 +02:00
072f2cc3a7
fix animation and consistently unload units from vehicle
...
#1575 and #1577
2015-06-11 15:56:11 -07:00
be6d72606a
Pain is always suppressed again
2015-06-11 22:35:50 +02:00
eef7c1295a
Added new adv. medical module option 'painIsOnlySuppressed'
2015-06-11 17:36:18 +02:00
0c40c1b439
Added Adv. Medical module option 'healHitPointAfterAdvBandage':
...
* Changed the default value to '0'
2015-06-11 15:30:39 +02:00
9d82b9a1f3
Merge pull request #1550 from acemod/medicalVanillaDamageFix
...
Attempt to fix #1465 and #1354
2015-06-11 10:25:50 +02:00
b6ed944123
Merge pull request #1563 from acemod/medicalCleanup
...
Cleanup
2015-06-11 10:25:28 +02:00
5431ab5e01
fixed conflicts
2015-06-10 20:03:00 +01:00
8a7d3e9ede
handleDamage_advanced cleanup
2015-06-10 17:10:09 +02:00
91ce327580
Newline
2015-06-10 17:07:35 +02:00
caae62b2af
Reverted handleDamage_advanced
2015-06-10 17:07:00 +02:00
245151d8c2
Removed spaces
2015-06-10 17:03:09 +02:00
1c2c7ef8d7
Fixed empty selectionNames in vehicle crashes
2015-06-10 17:02:14 +02:00
9336e7c9e1
[WIP] Various handleDamage_caching fixes
2015-06-10 16:51:46 +02:00
772a1e508b
Cleanup
2015-06-10 16:07:09 +02:00
0661d25ae3
Removed debug output
2015-06-10 16:06:46 +02:00
0f6c93852c
Fixed handling of falling damage
2015-06-10 12:59:55 +02:00
8bb3dbbaf6
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix
2015-06-10 12:59:11 +02:00
7318aae629
Cleanup
2015-06-10 12:47:22 +02:00
efa9cf4709
Fix handleDamage caching return value
...
Should never return nil. Instead, return a 0 as it's expecting new damage. this may fix the random vanilla damage kicking in.
2015-06-10 12:21:06 +02:00
e2890b0699
#1473 - Fix Medical Log Localization
...
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
d454a2ccfc
Attempt to fix #1465 and #1354
2015-06-09 15:46:00 +02:00
1ae8e29ac2
updated isPlayer v2
2015-06-08 19:12:16 +01:00
96fccbedf9
updated isPlayer
2015-06-08 11:09:49 +01:00
610f74d9d6
Merge pull request #1523 from AgentRev/onSetDead
...
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-07 23:58:22 +02:00
f7007b4175
Fixed "medical_onSetDead" event
2015-06-07 17:52:42 -04:00
d3eae58237
Fixed Zeus Unconscious
2015-06-07 12:17:52 +01:00
4a416a12a2
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-05 22:03:27 -04:00
84428e5e6c
Medical - unconsciousness: fix exitWith scope
2015-06-05 15:43:09 -05:00
4e8fc49b5e
Always remove fakeWeapon after adding
...
Should fix #1500
2015-06-05 15:38:45 -05:00
e01ba64683
Fix Missing Strings
2015-06-04 22:51:40 -05:00
5496333c26
Merge branch 'master' into macroSTR
...
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/CfgVehicles.hpp
addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
