Glowbal
130569c485
Made basic medical bleeding information work with new damage system
2015-09-05 11:57:17 +02:00
Glowbal
4514812523
Basic bandaging now works with new damage system
2015-09-05 11:51:46 +02:00
Glowbal
cd9e5df782
Clean up of handleDamage. Fixes some debug code
2015-09-05 11:25:56 +02:00
Glowbal
df3dbc9772
Removed deprecated fire handling
2015-09-05 11:25:31 +02:00
Glowbal
a25f640614
fixes #2114 No CPR available in basic medical when revive is enabled
2015-09-05 11:07:10 +02:00
Glowbal
3d342ece20
Fixes #2156 Animation is still played even if you cancel any treatment
2015-09-05 11:04:11 +02:00
ViperMaul
4c0c7bc290
debug change
2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d
Revert "Adding same ADV special case to BASIC handle damage." -Not Needed
...
This reverts commit bf267246bf
2015-09-04 10:20:34 -07:00
jonpas
644460ed96
Merge branch 'master' into parseList
...
Conflicts:
addons/slideshow/functions/fnc_makeList.sqf
2015-09-04 18:40:35 +02:00
ViperMaul
bf267246bf
Adding same ADV special case to BASIC handle damage.
2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc
Adding more debug
2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668
Fixing Debug for object variable hasPain
2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929
Fixed a debug statement.
2015-09-03 13:17:59 -07:00
commy2
b737f42777
fix error when opening triage card
2015-09-03 18:30:29 +02:00
commy2
795b7a893f
Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2
2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287
Add some debug values.
2015-09-03 08:18:37 -07:00
commy2
0bd92af072
fix variables not inited, csat armor scaleing
2015-09-03 17:17:54 +02:00
commy2
a84be46ed4
fix errors from cleanup
2015-09-03 15:49:49 +02:00
Glowbal
f38d245771
fixed bloodloss for basic medical
2015-09-02 21:56:00 +02:00
commy2
f939f9215e
stop flickering of wounds, fix #346
2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4
remove protection, hitpoint config (fix ubc), some debug stuff
2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c
Merge branch '323medicalstrcturaldamage' into medical-adjustments
2015-09-02 20:02:19 +02:00
commy2
f15805d1f3
setStructuralDamage function
2015-08-31 20:05:38 +02:00
Glowbal
8c6f896164
fixed script error when canceling treatment actions
2015-08-31 13:00:17 +02:00
Glowbal
4bde554854
Merge branch 'master' into medical-adjustments
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
2015-08-29 23:49:58 +02:00
Glowbal
2fd30ba20c
fixes #2274
2015-08-29 22:57:52 +02:00
Glowbal
ce42f5864f
fix #2155
2015-08-29 22:53:08 +02:00
Glowbal
b291141d11
Should Be a better fix for #2298
2015-08-29 22:51:42 +02:00
Glowbal
183e872f1f
Possible fix for #2298
2015-08-29 22:44:52 +02:00
PabstMirror
321ca815a2
semi-colon
2015-08-29 09:52:28 -05:00
jokoho48
8916b70fe1
Improve some Code
2015-08-29 15:29:02 +02:00
Glowbal
1e08244f21
Removed debug output
2015-08-29 12:59:11 +02:00
Glowbal
1a4736e663
Clean up
2015-08-29 12:01:00 +02:00
Glowbal
d56f3cea81
Added pain and unconsciousness handling for new basic medical code
2015-08-29 11:58:03 +02:00
Glowbal
0cfb492916
Fixes and removal of duplicate code
2015-08-26 10:04:51 +02:00
Glowbal
7a48f595be
Merge branch 'basic-medical-test' into medical-adjustments
2015-08-26 09:13:12 +02:00
gienkov
6a123020d2
fail to find BP on limbs with TQ on
2015-08-26 08:55:50 +02:00
Grzegorz
b8a29bfd44
@jokoho482 suggestion
2015-08-26 03:00:43 +02:00
gienkov
cae5f828fb
run check only on arms
2015-08-26 02:51:05 +02:00
gienkov
c3af5e81e7
fix my error
2015-08-26 02:41:12 +02:00
gienkov
5a9817322b
remove tabs
2015-08-26 02:39:34 +02:00
gienkov
8498589920
pulse zero on limb with TQ on
2015-08-26 02:37:51 +02:00
jonpas
5b6429f23e
Made more modules use assignObjectsInList common function
2015-08-24 21:55:48 +02:00
jokoho48
260b048da4
some more Improvements
2015-08-23 14:13:55 +02:00
jokoho48
fab4c6a67f
fix Spelling Issues
2015-08-22 21:32:36 +02:00
jokoho48
19dd55147a
Code Cleanup Medical Module (Part 4).
2015-08-22 19:47:23 +02:00
jokoho48
2d4ef16429
fix CTD
2015-08-22 18:54:51 +02:00
jokoho48
ff6c8a31be
Code Cleanup Medical Module (Part 3).
2015-08-22 18:33:06 +02:00
jokoho48
10127ed957
Fix Typo
2015-08-22 17:10:19 +02:00
jokoho48
d09ca9ec8b
Code Cleanup Medical Module (Part 1).
2015-08-22 16:25:10 +02:00
Glowbal
bf8318530e
Merge pull request #2081 from acemod/close-med-menus-distance
...
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-21 14:20:41 +02:00
Glowbal
20918f2c70
Merge pull request #2183 from acemod/treatmentWhileDeployed
...
Fix treatment when weapon deployed
2015-08-21 14:04:51 +02:00
SilentSpike
33ef60266b
Fix medical CPR code and log message
...
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
2015-08-19 23:30:13 +01:00
PabstMirror
dd58eef415
Fix double weapon switch for standing treatment
2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401
#2178 - Fix treatment when weapon deployed
2015-08-16 13:58:58 -05:00
Glowbal
17115b8846
test switch to adv medical handleDamage
2015-08-11 20:58:00 +02:00
Glowbal
9c8a03b0b3
fixes #2070 - medication is not translated on activity log
2015-08-09 20:12:31 +02:00
Glowbal
298f64a7bf
fixes #2078
...
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
2015-08-09 20:07:06 +02:00
Glowbal
3cac137851
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-09 09:14:42 +02:00
Glowbal
364e0455ee
Merge branch 'master' into medical-menu
2015-08-08 17:55:43 +02:00
Glowbal
be00f7ffe4
Merge pull request #2000 from acemod/treatmentResetWeaponMode
...
Treatment reset weapon mode
2015-08-08 14:20:10 +02:00
Glowbal
f21023b4ee
Added logs for quick view and activity view separate from the activity log for medical menu
2015-08-07 19:11:57 +02:00
Glowbal
f21da3ead6
Merge pull request #2026 from acemod/cleanBandages
...
Clean bandages if no damage on hitpoint
2015-08-07 15:46:44 +02:00
Glowbal
abaf43be11
Selection restrictions
2015-08-07 00:09:40 +02:00
Glowbal
5ac2972573
Added local event upon successful treatment.
2015-08-06 23:50:44 +02:00
PabstMirror
e45bd43e5e
CreateLitter / syncEvents performance fixes
2015-08-06 00:28:43 -05:00
PabstMirror
6ab72e905c
#1807 - Clean bandages if no damage on hitpoint
2015-08-05 17:32:00 -05:00
Glowbal
275b0c4300
Merge branch 'release'
...
Conflicts:
README.md
addons/finger/stringtable.xml
2015-08-04 22:29:05 +02:00
PabstMirror
b3741f4036
Capitalization for macro CBA_fnc_addPerFrameHandler
2015-08-04 02:34:38 -05:00
PabstMirror
710135ae3f
Opps
2015-08-03 21:49:16 -05:00
PabstMirror
fa49842c53
#1866 - Restore weapon mode after treatment
2015-08-03 19:57:49 -05:00
Glowbal
ca2a16af02
fix #1946
2015-07-30 18:21:24 +02:00
Glowbal
a4d5d9cb27
Possible improvement for handling minor levels of pain in advanced medical
2015-07-30 17:43:52 +02:00
PabstMirror
cbd74d768b
Medical - Don't play *_medic anims at end
2015-07-23 02:43:19 -05:00
PabstMirror
d4f70134e6
medical/setUnconscious header
2015-07-12 10:25:00 -05:00
Glowbal
d3bed7aedb
fixed -1 to disable the revive timer does not work
2015-07-09 13:02:48 +02:00
Glowbal
44de95ea81
Merge pull request #1790 from acemod/medicalImprovements
...
Medical improvements
2015-07-03 22:21:20 +02:00
Glowbal
9edf1b1adf
Implemented use conditions for PAK and SurgicalKit
...
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
Glowbal
e153e47bb2
Disabled litter on treatment failure. #1403
...
We give back the items, so litter does not make sense at the moment.
In the future we need to expand this with conditions for success/failure.
2015-06-20 12:54:00 +02:00
Glowbal
9e00fc479b
CPR local is now also only executed when the target is still alive.
...
Otherwise it's quite useless
2015-06-20 12:51:42 +02:00
Glowbal
ea0be1f563
Only execute the local handling of CPR when in a valid state
2015-06-20 12:46:26 +02:00
Glowbal
385baf1331
Using CPR while in revive state will extend the life timer
2015-06-20 12:44:52 +02:00
Glowbal
9795647d9c
While in revive state, ensure vitals are never above 0 for adv medical
2015-06-20 12:44:29 +02:00
Glowbal
3f5a050745
Fixed #1693
2015-06-20 12:38:12 +02:00
Glowbal
c3e2d1bf9c
Removed always unconscious for basic medical
2015-06-20 12:23:40 +02:00
Glowbal
5887c59c05
Made fix properly for advanced medical
2015-06-19 23:03:31 +02:00
Glowbal
300a33ea0a
Initial work
2015-06-19 22:53:25 +02:00
PabstMirror
1c5788baab
Medical - change hrIncrease random min/max
2015-06-14 03:54:50 -05:00
Glowbal
91b54bfc3a
Adds a back up function in sqf to assign open wounds.
2015-06-13 23:20:01 +02:00
ViperMaul
1322da5537
Merge pull request #1587 from acemod/fixVehicleUnconcious
...
fix animation and consistently unload units from vehicle
2015-06-13 12:44:34 -07:00
Glowbal
5013254769
Merge pull request #1530 from legman/akalegman_zeus_unconscious
...
Fixed Zeus Unconscious
2015-06-13 20:48:18 +02:00
Glowbal
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
ulteq
6d6c3a4285
Fixed function header
2015-06-13 19:17:26 +02:00
Glowbal
e0bb3c0a4e
Merge pull request #1602 from acemod/medicalFallingFix2
...
[Adv. Medical] Improved falling damage
2015-06-13 13:39:22 +02:00
Glowbal
ce908f0fb3
Merge pull request #1579 from acemod/medicalModuleOptions
...
[Adv. Medical] New module options
2015-06-13 13:37:02 +02:00
ulteq
1c4566984f
Removed debug output
2015-06-13 12:13:58 +02:00
ulteq
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
ViperMaul
1c0811aa31
Change from globalEvent to targetEvent
...
#1575 and #1577
2015-06-12 16:56:13 -07:00
ulteq
604cd122d3
Experiment
2015-06-12 13:54:52 +02:00
ulteq
6ac2ca9208
Fixes _projectile not being updated
2015-06-12 11:48:49 +02:00
ulteq
46a73f3177
Added a function to calculate the PAK treatmentTime
2015-06-12 11:42:49 +02:00
ViperMaul
072f2cc3a7
fix animation and consistently unload units from vehicle
...
#1575 and #1577
2015-06-11 15:56:11 -07:00
ulteq
be6d72606a
Pain is always suppressed again
2015-06-11 22:35:50 +02:00
ulteq
eef7c1295a
Added new adv. medical module option 'painIsOnlySuppressed'
2015-06-11 17:36:18 +02:00
ulteq
0c40c1b439
Added Adv. Medical module option 'healHitPointAfterAdvBandage':
...
* Changed the default value to '0'
2015-06-11 15:30:39 +02:00
Glowbal
9d82b9a1f3
Merge pull request #1550 from acemod/medicalVanillaDamageFix
...
Attempt to fix #1465 and #1354
2015-06-11 10:25:50 +02:00
Glowbal
b6ed944123
Merge pull request #1563 from acemod/medicalCleanup
...
Cleanup
2015-06-11 10:25:28 +02:00
AKALegman
5431ab5e01
fixed conflicts
2015-06-10 20:03:00 +01:00
ulteq
8a7d3e9ede
handleDamage_advanced cleanup
2015-06-10 17:10:09 +02:00
ulteq
91ce327580
Newline
2015-06-10 17:07:35 +02:00
ulteq
caae62b2af
Reverted handleDamage_advanced
2015-06-10 17:07:00 +02:00
ulteq
245151d8c2
Removed spaces
2015-06-10 17:03:09 +02:00
ulteq
1c2c7ef8d7
Fixed empty selectionNames in vehicle crashes
2015-06-10 17:02:14 +02:00
ulteq
9336e7c9e1
[WIP] Various handleDamage_caching fixes
2015-06-10 16:51:46 +02:00
ulteq
772a1e508b
Cleanup
2015-06-10 16:07:09 +02:00
ulteq
0661d25ae3
Removed debug output
2015-06-10 16:06:46 +02:00
ulteq
0f6c93852c
Fixed handling of falling damage
2015-06-10 12:59:55 +02:00
ulteq
8bb3dbbaf6
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medicalVanillaDamageFix
2015-06-10 12:59:11 +02:00
ulteq
7318aae629
Cleanup
2015-06-10 12:47:22 +02:00
Glowbal
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
PabstMirror
e2890b0699
#1473 - Fix Medical Log Localization
...
also swap some common EFUNCs
2015-06-09 17:30:02 -05:00
ulteq
d454a2ccfc
Attempt to fix #1465 and #1354
2015-06-09 15:46:00 +02:00
AKALegman
1ae8e29ac2
updated isPlayer v2
2015-06-08 19:12:16 +01:00
AKALegman
96fccbedf9
updated isPlayer
2015-06-08 11:09:49 +01:00
Glowbal
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
AgentRev
f7007b4175
Fixed "medical_onSetDead" event
2015-06-07 17:52:42 -04:00
AKALegman
d3eae58237
Fixed Zeus Unconscious
2015-06-07 12:17:52 +01:00
AgentRev
4a416a12a2
Added "medical_onSetDead" local event in fnc_setDead.sqf
2015-06-05 22:03:27 -04:00
PabstMirror
84428e5e6c
Medical - unconsciousness: fix exitWith scope
2015-06-05 15:43:09 -05:00
PabstMirror
4e8fc49b5e
Always remove fakeWeapon after adding
...
Should fix #1500
2015-06-05 15:38:45 -05:00
PabstMirror
e01ba64683
Fix Missing Strings
2015-06-04 22:51:40 -05:00
jonpas
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
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
ulteq
048e5b6f6d
Body bag cleanup:
...
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
ulteq
14607f7aba
Fixes random body bag teleports
2015-06-01 21:23:00 +02:00
PabstMirror
f57427ec96
switch waitAndExecute with 0 delay to execNextFrame
...
Should Fix #1463
2015-06-01 13:14:05 -05:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
Glowbal
552b2f390f
Merge pull request #1256 from acemod/medicalExtension
...
Medical Extension for handleDamage wounds
2015-05-29 23:16:00 +02:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Glowbal
d34c96038e
Merge branch 'master' of github.com:acemod/ACE3
2015-05-28 20:56:35 +02:00
Glowbal
9135d956f0
Merge branch 'surgicalkit'
2015-05-28 20:54:52 +02:00
Glowbal
27106ce59f
minor refactor
2015-05-28 20:54:13 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
BaerMitUmlaut
f2e6a98eb4
Killed tabs
2015-05-27 13:51:22 +02:00
BaerMitUmlaut
6894a7433a
Removed duplicate private var
2015-05-27 13:51:15 +02:00
BaerMitUmlaut
f7578a92c9
Reverted in favour of onProgress treatment
2015-05-27 00:52:16 +02:00
BaerMitUmlaut
30df0e8dc9
Switched to callbackPogress for treatment
2015-05-27 00:45:50 +02:00
BaerMitUmlaut
890b568225
Implemented dynamic treatment time
2015-05-27 00:45:22 +02:00
Glowbal
4945f22f3e
Merge branch 'master' into medicalExtension
2015-05-26 22:42:26 +02:00
ViperMaul
388d6c3519
Change to the proper isAwake function
...
#1375
2015-05-25 20:47:28 -07:00
BaerMitUmlaut
41892fd6df
Added surgicalKit treatment
2015-05-26 00:33:20 +02:00
ViperMaul
3bdb27386c
removing obsolete drag code
...
#1375
2015-05-25 10:25:28 -07:00
ViperMaul
7141d251c7
create unloadPersonLocal
...
#1375
2015-05-25 09:41:24 -07:00
ViperMaul
cafaef9612
revert missing actionDragUnit file
...
#1375
2015-05-25 09:39:12 -07:00
ViperMaul
06932f0c03
Restore missing actionDragUnit function file
...
#1375
2015-05-24 15:14:11 -07:00
PabstMirror
d82fcd1f96
Advanced - Bloodbag lookup by treatment not item
2015-05-23 01:26:13 -05:00
PabstMirror
d752dd50d0
Basic - Bloodbag size matters
2015-05-23 01:16:18 -05:00
PabstMirror
8fd0aef7d4
Medical - Fix Handle Damage
...
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
2015-05-22 16:35:48 -05:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
1aa9520adb
Fix Script Error when treating with bincos
2015-05-20 23:24:44 -05:00
KoffeinFlummi
f16f282abd
Merge remote-tracking branch 'origin/release' into master-fix
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
extensions/common/p3d/animation.cpp
extensions/common/p3d/compressed.cpp
extensions/common/p3d/compressed.hpp
extensions/common/pbo/archive.cpp
extensions/common/pbo/search.cpp
extensions/common/pbo/search.hpp
extensions/common/shared.hpp
extensions/common/simplepipe_win32.cpp
extensions/common/simplepipe_win32.hpp
extensions/common/simulation/object.cpp
extensions/common/simulation/object.hpp
extensions/common/targetver.h
extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
0d00894d9f
#1318 - isInMedicalVehicle - medicClass is number
2015-05-20 17:17:09 +02:00
Glowbal
694a24c970
Only change the color if bleeding (adv)
2015-05-20 17:15:25 +02:00
Glowbal
2b1468db24
Added pain suppression instead of removal
2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1
fixed missing parameters for non local unit
2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d
Added force unconscious parameter #1205
2015-05-20 17:15:21 +02:00
Glowbal
808bb6d048
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589
fixes #1155
2015-05-20 17:15:19 +02:00
PabstMirror
4d877196e4
Missing Parenthesissies
2015-05-19 00:36:54 -05:00
Glowbal
572b46a473
fix for #1297 Being near Campfires messes up basic medical and causes large fps lag
...
Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.
2015-05-19 07:23:44 +02:00
Glowbal
539ed2dc79
Fix debug message and prevent Instant death inside vehicles
2015-05-18 22:22:57 +02:00
Glowbal
771b62ed04
Fix medical vehicle return value
...
Could fix #1142
2015-05-18 21:33:35 +02:00
PabstMirror
c6991fde54
re-add brackets
2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c
fixed incorrect private var name
2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a
consistent usage of brackets
2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec
Use PFEH array instead of setVariable
2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603
Start vital tracking after treatment
2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49
Calculate vitals interval on first run
2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c
fixes #1155
2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8
Change to execNextFrame.
2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4
Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112
2015-05-18 20:59:56 +02:00
Glowbal
d9da4211f7
Merge branch 'master' into medicalExtension
2015-05-17 09:51:41 +02:00
Glowbal
556b9ad7d8
removed debug prints
2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae
Removed old sqf version.
2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f
Temp added old sqf version for easy performance comparison
2015-05-17 00:08:34 +02:00
Glowbal
e3dd1eaf47
Using extension for handleDamage wounds instead of sqf
2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca
Loading config data to extension
2015-05-16 23:20:38 +02:00
PabstMirror
1d64e5917f
re-add brackets
2015-05-15 02:32:19 -05:00
Glowbal
56aec85616
fixed incorrect private var name
2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4
consistent usage of brackets
2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be
Use PFEH array instead of setVariable
2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de
Start vital tracking after treatment
2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef
Calculate vitals interval on first run
2015-05-14 22:16:44 -05:00
Glowbal
d42d0ef69d
Merge pull request #1164 from acemod/litterFixes
...
Litter distribution fix and "floating litter over water" fix (medical)
2015-05-14 16:17:10 +02:00
jaynus
20bd5957e3
Change to execNextFrame.
2015-05-14 07:15:52 -07:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
jaynus
b13d44fb6b
Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112
2015-05-13 17:29:09 -07:00
Glowbal
a4d0af4b67
Fix medical vehicle return value
...
Could fix #1142
2015-05-13 15:55:03 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Glowbal
e6a8f0b295
Merge pull request #1103 from SilentSpike/medical_typofix
...
Trivial variable name fix for moduleAssignMedicalVehicle function
2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6
false -> 0
2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e
isMedic -> medicClass
2015-05-10 20:19:32 +01:00
SilentSpike
d321ed2753
Changed function variable to match other medical vehicle functions
2015-05-10 19:56:35 +01:00
Glowbal
e674229dde
enabledFor > enableFor
2015-05-08 20:10:40 +02:00
Glowbal
ae47c78552
Make treatment execute before createLitter
2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1
Ensure that litterCondition is always code #1000
2015-05-04 00:16:12 +02:00
PabstMirror
436e50411a
Medical - Fix Uncon PFEH argument changes
2015-05-01 22:42:43 -05:00
PabstMirror
bded34fa23
I suck at git
...
redo reverted stuff here
2015-05-01 15:03:05 -05:00
Glowbal
80162627ec
Fixed spelling of enableUnconsciousnessAI
2015-05-01 18:49:59 +02:00
Glowbal
5beca63ae2
Added missing private
2015-05-01 11:51:23 +02:00
KoffeinFlummi
e06e1a2f89
Make preventDeath work
2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464
Let setUncon handle AI unconsciousness
2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2
Rename caching variables in basic HD
2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f
Reduce animation forcing delay
2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8
Offload ejecting to unloadPerson
2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3
Proper privates and alignment
2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7
Whoops
2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea
Merge remote-tracking branch 'origin/master' into basic-med-options
...
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
KoffeinFlummi
d59436c588
Only force animation when necessary
2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903
Fix missing semicolon
2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf
Reorganize AI unconsciousness
2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938
Remove max unconsciousness time again
2015-04-30 22:15:40 +02:00
KoffeinFlummi
270c3adc1e
Do it again, but properly this time
2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92
Convert Medical stringtable key names to lowercase
2015-04-30 22:01:09 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
KoffeinFlummi
fd152c580b
Merge branch 'master' into basic-med-options
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
48f7455ef1
Opps2
2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359
opps
2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89
Medical Private Variables
2015-04-30 01:17:26 -05:00
PabstMirror
f90834eeab
Unused
2015-04-29 16:57:24 -05:00
PabstMirror
5fef446c00
EFUNC for dragging calls
2015-04-29 16:53:09 -05:00
PabstMirror
a39e869728
Fix extra {} wraped
...
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
2015-04-29 16:44:47 -05:00
Glowbal
aaa8171457
Implemented prevent instant death #839
2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12
fixes #838
2015-04-29 22:04:46 +02:00
Glowbal
87465b8b10
fixes #829
2015-04-29 21:49:24 +02:00
Glowbal
a854b90b00
Increased level at which a lot of blood message gets shown in basic medical
2015-04-28 22:19:30 +02:00
Glowbal
f606c24854
fixes #901
2015-04-28 20:47:11 +02:00
Glowbal
95d83554da
Added local treatment through remoteExec for basic
2015-04-28 20:32:02 +02:00
Glowbal
c38fe384e3
added default values for getvar's
2015-04-28 19:30:35 +02:00
Glowbal
450e324f7b
adjusted damage handling (adv medical)
2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c
adjusted damage parsing
2015-04-27 16:36:00 +02:00
Glowbal
b520a1072b
Merge branch 'master' into medicalImprovements
2015-04-27 15:41:20 +02:00
commy2
6aea424f6d
Merge pull request #872 from acemod/muteuncon
...
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
8976b6983d
mute unconsious units
2015-04-26 16:47:36 +02:00
bux578
b2dd065429
remove comment
2015-04-26 12:27:06 +02:00
bux578
171cea998e
add most of the translations
2015-04-26 09:36:51 +02:00
Glowbal
11d86248a7
Reorganised module and settings #809
2015-04-25 22:20:28 +02:00
Glowbal
6799903e4b
Also display different color for advanced
2015-04-25 12:45:04 +02:00
