5db1a8671e
More cleanup work
2019-04-26 16:41:30 -04:00
9fa0b8bea1
Move medical logs clearing to treatment
2019-04-26 15:54:36 -04:00
e57a6fbb13
Fixes and code review changes
2019-04-26 15:35:12 -04:00
93d3fd58a4
fix merge for renamed files
2019-04-26 12:41:43 -05:00
8a29957b15
Merge branch 'limping' into medical-treatment-work-rebaseLimping
2019-04-26 11:50:20 -05:00
2e897e86a2
fix
2019-04-25 23:21:44 -05:00
da6876441e
localizations and event
2019-04-25 23:16:43 -05:00
cc22e95012
Fastroping - Remove FRIES on vehicle deletion / adjust Ghosthawk Fries ( #6932 )
...
* fastroping_fnc_deequipFRIES, remove FRIES on vehicle deletion
* Prevent FRIES from clipping into Ghost Hawk right door
* UNequipFRIES
* Remove fastroping checkVehicleThread
* Document FRIES equip and unequip functions
2019-04-25 13:31:36 -05:00
83cd316b2e
Common - Don't add UAV AI to localUnits array ( #6951 )
...
* Common - Don't add UAV AI to localUnits array
* Update addons/common/functions/fnc_setupLocalUnitsHandler.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
2019-04-25 13:30:43 -05:00
15401468b9
Refuel - Drop nozzle at unit's feet if no valid pos found ( #6957 )
...
* Refuel - Drop nozzle at unit's feet if no valid pos found
Fix #6944
* Update fnc_dropNozzle.sqf
* Update addons/refuel/functions/fnc_dropNozzle.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
2019-04-25 13:28:11 -05:00
1f1d950588
Map - Don't enable map light for parachutes ( #6961 )
2019-04-25 13:27:53 -05:00
80aa05e6e6
Add arm fractures and aim effects
2019-04-23 22:34:34 -05:00
28ac653635
Merge pull request #6953 from acemod/cba-disposable-compat
...
compatibility with CBA disposable framework
2019-04-19 14:36:08 +02:00
07ee2c1d3d
compatibility with CBA disposable framework
2019-04-19 14:33:57 +02:00
ad3f0fd263
Splinting and treatment and gui
2019-04-18 00:40:15 -05:00
8da089d310
Change wound data array
...
Drop unique id and merge classId and category
2019-04-17 17:48:04 -05:00
92d13fc930
Improve adjustment calcs / wound blood loss / medications
...
fix func descriptions
Calc wound blood loss on events
reorder includes so scritpmacroMed has global effect
trivial optimization for getCardiacOutput
Fix var
Fix wounds not reopening (nil _category)
Fix surgical kit inherting canBandage conditional
debug hitpoints
Update ACE_Medical_Treatment_Actions.hpp
Use woundBleeding for IS_BLEEDING macro
rework medication vars
comments
Reset var in init / fullHeal
Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
2019-04-17 17:46:02 -05:00
56811403f2
Medical - add eh for setUnconscious helper func ( #6937 )
2019-04-16 16:47:13 -05:00
b4f91960ce
Fix litterCleanupDelay name
2019-04-13 19:06:00 -04:00
17f4af37fa
Merge pull request #6936 from alganthe/fixArsenalNVGBlacklist
...
[ACE Arsenal] Fix NVGs not being subject to blacklisting in loadouts
2019-04-12 17:29:34 +02:00
8fe02a455f
Fix #6935
2019-04-12 14:39:28 +02:00
1acfff81d7
One line for each old public function
2019-04-11 09:54:52 -04:00
e5fb28965e
Merge branch 'master' into medical-treatment-work
2019-04-11 07:33:11 -04:00
0155c435bd
Modernize and cleanup medical_treatment
2019-04-11 07:25:20 -04:00
69dc73ee45
Medical Feedback - fix heart rate effect ( #6927 )
...
* Medical Fedback - fix heart rate effect
and limit setVar for acre/tfar
* Apply suggestions from code review
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
* Update XEH_postInit.sqf
* use "task_force_radio"
2019-04-09 10:51:59 -07:00
0926d8508c
Ballistics - Remove ace mags from incompatible weapons ( #6930 )
...
Close #6924
Co-Authored-By: drofseh <drofseh@users.noreply.github.com >
2019-04-09 10:44:20 -07:00
c392236843
Medical activity to non local units is not logged ( #6925 )
...
* Fixes medical events not appearing in MP (when unit is non local)
Adds name to AUTHORS.txt (forgot to do this in other PRs)
* Fixes missing oef line
* Update addons/medical_treatment/XEH_postInit.sqf
Co-Authored-By: redbery <rutger@meijering.me >
* delete rogue character
2019-04-07 17:41:28 -05:00
641dee39bd
Fix trivial bugs ( #6922 )
2019-04-07 14:22:25 +02:00
d2172c5060
Merge pull request #6921 from acemod/compatCBA2DOptics
...
compatibility with CBA scripted 2d optics framework
2019-04-03 20:46:36 +02:00
c63310be95
compatibility with CBA scripted 2d optics framework
2019-04-03 20:41:15 +02:00
039ca9a053
compatibility with CBA scripted 2d optics framework
2019-04-03 20:39:11 +02:00
6d50667359
Fastroping - Add user setting to confirm cutting ropes ( #6876 )
...
* Fastroping - Add user setting to confirm cutting ropes
* always confirm
* fix
* Update stringtable.xml
2019-04-03 12:18:55 -05:00
ece1031c4d
RHS Compat - Add 2 round hellfire to pylon options ( #6893 )
...
* RHS Compat - Add 2 rnd hellfire pylon
Close #5957
* change magwell name
* gvar->addon
2019-04-03 11:40:14 -05:00
9588b13942
Zeus/Medical - Fix modules for rewrite ( #6914 )
...
* Zeus/Medical - Fix modules for rewrite
* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
55a7d53437
Medical - Add condition for surgicial kit ( #6916 )
...
* Added condition canStitch
* Update XEH_PREP.hpp
* Update addons/medical_treatment/functions/fnc_canStitch.sqf
Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com >
* Added example, removed arguments information and changed > to isEqualTo
* Added example in canBandage too
2019-04-03 04:36:37 -07:00
24a533b968
Prevent opening the medical menu if the player is unconscious ( #6915 )
2019-04-02 08:57:28 -05:00
db6dadb78f
Fix config ( #6905 )
2019-04-01 09:45:36 -05:00
b907c9d547
Medical - Add self interaction when needed ( #6912 )
...
* Medical - Add self interaction when needed
* Update addons/medical_gui/XEH_postInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
* Update addons/medical_gui/XEH_postInit.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com >
2019-04-01 09:40:02 -05:00
978049eab1
Add keep engine of vehicles running after getting out ( #6885 )
...
Adds a feature which leaves the vehicle engine running after getting out. So, it requires the driver to switch off the engine of the vehicle.
2019-04-01 11:17:18 +02:00
3769679237
Add tool to verify stringtable entries exist ( #6889 )
...
* Add tool to verify stringtable entries exist
* Update circle.yml
* test
* Allow running from root directory as well as from inside the tools directory
2019-03-31 15:27:51 -05:00
c7e6549eb2
Cookoff - Reword settings and move to cba ( #6892 )
...
* Cookoff - Reword settings and move to cba
* Update stringtable.xml
2019-03-30 21:54:12 -05:00
0052dd3af2
Interaction - Pass Magazine fixes ( #6894 )
...
Use CBA_fnc_compatibleMagazines
Fix nil return if no mags
Ensure target canAdd
2019-03-30 20:49:59 -05:00
30b99fa20a
Medical Rewrite - Remove dropDownTriageCard function ( #6907 )
...
* Remove dropDownTriageCard function
* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
ac1651c6db
Prevent bandaging when not bleeding ( #6532 )
2019-03-30 15:44:58 -05:00
2ea534ae1a
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2019-03-30 21:21:39 +01:00
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
...
Medical rewrite
2019-03-30 15:20:15 -05:00
f2b9bf3a17
Update headers
2019-03-30 11:07:54 -05:00
7f2ac32180
Fix event for items conversion
2019-03-30 09:56:21 -05:00
f0fb267501
Include medical_feedback settings.sqf file ( #6903 )
2019-03-30 14:19:41 +00:00
37daf3429d
Fix .300NM Berger Hybrid airFriction ( #6901 )
2019-03-29 21:40:38 +01:00
