Commit Graph

13173 Commits

Author SHA1 Message Date
Rutger "RedBery" Meijering
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
PabstMirror
641dee39bd Fix trivial bugs (#6922) 2019-04-07 14:22:25 +02:00
Josuan Albin
d2172c5060
Merge pull request #6921 from acemod/compatCBA2DOptics
compatibility with CBA scripted 2d optics framework
2019-04-03 20:46:36 +02:00
commy2
c63310be95 compatibility with CBA scripted 2d optics framework 2019-04-03 20:41:15 +02:00
commy2
039ca9a053 compatibility with CBA scripted 2d optics framework 2019-04-03 20:39:11 +02:00
PabstMirror
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
PabstMirror
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
PabstMirror
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
Katalam
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
Magnetar
24a533b968 Prevent opening the medical menu if the player is unconscious (#6915) 2019-04-02 08:57:28 -05:00
Dystopian
db6dadb78f Fix config (#6905) 2019-04-01 09:45:36 -05:00
PabstMirror
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
brainslush
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
PabstMirror
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
PabstMirror
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
PabstMirror
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
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907)
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
SilentSpike
ac1651c6db Prevent bandaging when not bleeding (#6532) 2019-03-30 15:44:58 -05:00
ace3mod
2ea534ae1a [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2019-03-30 21:21:39 +01:00
PabstMirror
16ed2a82c2
Merge pull request #4064 from acemod/medical-rewrite
Medical rewrite
2019-03-30 15:20:15 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -05:00
PabstMirror
7f2ac32180 Fix event for items conversion 2019-03-30 09:56:21 -05:00
Rutger "RedBery" Meijering
f0fb267501 Include medical_feedback settings.sqf file (#6903) 2019-03-30 14:19:41 +00:00
Laid3acK
37daf3429d Fix .300NM Berger Hybrid airFriction (#6901) 2019-03-29 21:40:38 +01:00
PabstMirror
047583ce1d rectify localUnits func #4836 2019-03-25 22:49:53 -05:00
PabstMirror
a8c51cc571 RHS Compat - Update hearing configs values for helmets (#6891)
Close #6884
2019-03-25 10:07:31 +01:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings (#6890)
* Handle old public funcs, fix strings

* Update addons/medical/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
mharis001
8d2bba4b35
Rewrite Medical GUI (#6831)
* Add a macro for the bloodloss scaling factor

* Adjust bloodloss threshold for red icon

* Remove bloodloss color scaling factor

The issue is actually the other way round, the factor of 20 would
instantly make bodyparts red on taking a wound.

* Implemet 10 color steps provided by ShackTac

This replaces the old method of colouring the interaction menu icons
and body image selections with a new method that has 10 distinct color
steps (matching across the icons and the body image).

* Use macros for constants

* Implement blue damage colouring

This re-adds visualisation for colouring based on damage. The case where
a limb has a tourniquet will hopefully be handled by an overlayed icon.

* Tidy up file structure

* Move patient information display to medical_ui

* Make common colour conversion code into functions

* Add tourniquet icon overlay to body image

* Fix mispelling I forgot to commit

* Update icon paths to new white cross icon

* Clean mess after rebase

* Add new medical menu gui

* Add updating injury list and body image

* Add updating treatment category buttons

* Update onMenuClose function

* Delete unused functions

* Add action buttons and triage card to menu

* Move medical menu PFH to separate function

* Move setTriageStatus to treatment

* Add triage select dropdown

* Add toggle button action

* Fix mouse moving randomly when opening

* Add logs list update and remove unused functions

* Hide tourniquet icons by default

* Remove CfgInGameUI (already in feedback)

* Update patient info display

* Update triage card display

* Add settings to control interact menu actions

* Cleanup files/paths

* Move triage status update to common function

* Add icons for interact menu actions

* Modify icon color for interact menu actions

* Update canOpenMenu for new setting

* Hide pain information for unconscious

* Stringtable cleanup

* Use switch for pain text

* Change minor triage status to minimal

* Fix injury list to use new stringtable entry names

* Fix medical actions check when disabled

* Skip distance check in same vehicle

* More cleanup

* Fix CI error

* Requested changes

* Fix INJURIES string

* Fix include after comment block

* Fix missing ;

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-03-24 18:17:48 -04:00
commy2
4968d9073e
Merge pull request #4605 from acemod/draggingFixes
Disable collision while carrying, Fix floating on disabled simulation objects
2019-03-24 22:14:34 +01:00
commy2
b4d2eaae6e
Use needsRestart flag 2019-03-24 10:15:56 +01:00
commy2
5277bc083b fix a macro 2019-03-24 09:41:36 +01:00
commy2
6cff8deba8 cleanup dragging 2019-03-24 09:28:58 +01:00
commy2
6ac2906aba setMass method to disable collisions 2019-03-24 09:26:00 +01:00
PabstMirror
f23927d84a Fix some strings 2019-03-24 00:50:36 -05:00
PabstMirror
2d0090422c move settings to sqf 2019-03-24 00:37:39 -05:00
PabstMirror
c492f184b4 move dev funcs to folder 2019-03-23 19:55:04 -05:00
commy2
cea1599112 manual merge 2019-03-23 23:46:30 +01:00
SilentSpike
0cd904bdc3 Add public function documentation script (#5253)
* Remove obsolete event rename script

* Add initial function documenting python script

- Currently only finds all public/invalid function files
- Method "document_public" is in place to handle the data taken from a
  function header, but currently unimplemented

* Add author/description/arguments processing

* Improve console logging and add return processing

* Use class based approach for better data handling

* Add argument processing with support for notes

* Implement rudimentary doc output

* Add return and example processing

* Fix example variable

* Fix documenting no arguments/return

* Fix malformed return handling

* Improve control flow
2019-03-23 23:21:33 +01:00
Thomas Kooi
bc2d84289b Consistently make use of the dot (#6888) 2019-03-23 22:41:05 +01:00
PabstMirror
2ea029c219
Quickmount - optimize subActions (#6883) 2019-03-21 21:29:51 -05:00
Unknown
a8d28ebedc Merge remote-tracking branch 'upstream/master' into medical-rewrite 2019-03-21 17:51:19 -04:00
Rutger "RedBery" Meijering
15036d7fd8 Fixes to unconsciousness and damageTypes systems (#6589)
* Fixes BleedingCoef having impact on bloodloss KO
Fixes incorrect var in setUnconscious

* Changes method for checking if typeOfDamage is valid
Adds check for if typeOfDamage is valid to extension version of woundsHandler

* Changes collision wound location select to a weighted system to make it more lethal at faster collisions
Adds collision and drowning damage types to config (drowning has no related wounds to prevent wounds being added while drowning).

* Fixes unneeded space

* Fixes minor mistake (body damage chance should go from 1 to 0 without ever becoming negative)
2019-03-21 19:33:51 +01:00
PabstMirror
e8970ab8ad ACE_settings captiliaztion 2019-03-21 09:46:23 -05:00
PabstMirror
711e9073a8
Explosives - Allow setting custom timer limits (#6882) 2019-03-21 09:01:50 -05:00
ace3mod
61e88abf22 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2019-03-21 14:54:11 +01:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859)
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Dystopian
d804d3afe6 Cleanup some functions headers and macro using (#6866)
* Cleanup frisking

* Cleanup header format

* Cleanup FUNC macro using
2019-03-20 15:18:43 -05:00
Magnetar
89927a8b94 Missing privates. Lazy evaluation. 2019-03-17 21:26:15 +01:00
Magnetar
934339d1df Fix missing INJURY string 2019-03-17 18:38:31 +01:00