Commit Graph

10878 Commits

Author SHA1 Message Date
Dedmen Miller
26fe041342 Move gunbag type from inheritance to config property (#7022)
* Move gunbag type from inheritance to config property

* Add gunbag framework wiki

* Remove _generalMacro from doc

* Apply documentation suggestions

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-06-04 20:00:55 -05:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933)
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* 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>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-03 10:31:46 -05:00
barman75
d684a8042e Russian translations (#7005)
* Russian translation is done

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Update addons/arsenal/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/advanced_fatigue/stringtable.xml

* Update addons/arsenal/stringtable.xml

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration, still WIP

Co-Authored-By: Dystopian <sddex@ya.ru>

* next iteration 2, still WIP, sorry

Co-Authored-By: Dystopian <sddex@ya.ru>

* re-translation in /captives and small fixes in /explosives

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

small fixes

Co-Authored-By: Dystopian <sddex@ya.ru>

* Apply suggestions from code review

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* /arsenal and /captives resolve

Co-Authored-By: Dystopian <sddex@ya.ru>

* minor changes in /scopes, almost done

Co-Authored-By: Dystopian <sddex@ya.ru>

* Some strings shortened for menu

Co-Authored-By: Dystopian <sddex@ya.ru>
2019-06-03 09:59:13 -05:00
PabstMirror
7a62e96945
Grenades - Don't flashbang spectators (#7029) 2019-06-03 09:44:17 -05:00
Laid3acK
4ea068535b Ballistics - BI P90 and RHS MP7 updated (#7025)
* rhs_mp7_ammo_46x30_airFriction

* rhs_mp7_mag_46x30_initSpeed

* rhs_mp7_weapon_46x30_BaseAngle

* rhs_mp7_ammo_46x30_airFriction

* bi_p90_ammo_570x28_airFriction

* bi_p90_weapon_570x28_initSpeed
2019-05-30 13:34:18 -05:00
Vdauphin
4fa131573f Fractures is misspelled (#7026)
@Drofseh
2019-05-30 13:33:51 -05:00
commy2
4e04100ea9 Spotting scope - New reticle using CBA scripted optics (#6964)
* new reticle for spotting scope

* reticle b

* illuminated reticle for night

* use orig spotting scope reticle, bigger occular

* fix spotting scope attenuation
2019-05-27 10:46:21 -05:00
commy2
33602df517 Vector - New reticle using CBA scripted optics (#6981)
* vector IV updates

* vector IV updates

* compat cba optics and vector scripts

* hide periphery

* reticle texture for 7x magnification

* vector display config

* idc macros, fix illum mode

* add radblur effect when using optic

* hide zeroing control

* delete a broken config entry

* fix horizontal and vertical distance mode

* set REQUIRED_CBA_VERSION to 3.11.2
2019-05-27 10:46:07 -05:00
BaerMitUmlaut
452cba7ff7
Add vanilla magwells for 40mm grenades (#7004) 2019-05-22 01:31:37 +02:00
PabstMirror
50afcda918 Medical - Exit turret gunner view when going unconscious (#7003) 2019-05-20 21:12:18 +01:00
PabstMirror
c6609cbdb9
Common - Fix script error with uniqueItems in scheduled (#6998) 2019-05-13 17:20:01 -05:00
SilentSpike
82083323f2 Fix volume level of Soundinjured_Max files 2019-05-12 07:53:49 +01:00
Oliver Blanthorn
c012941af0 Add support for N-bangs (#6848)
* Add support for multi-bang flashbangs

It also adds some randomness to 1-bangs as a side effect,
but I don't think that's a big deal.

Also adds flashbang documentation to wiki.

* Increase rate at which flashbang attenuates

Apologies for the magic numbers. I just tested a few out
until I was happy with the result. The radius could probably
afford to be reduced a little further.

* use max deviation in config, fix wiki file name
2019-05-11 23:43:32 -05:00
classic
7b44138282 Update Japanese translation (#6980)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml

* fix
2019-05-11 23:33:49 -05:00
mharis001
7877ce3116 Spectator - Add setting for follow camera max distance (#6989)
* Add setting for follow camera max distance

* Convert spectator settings to CBA function
2019-05-11 23:32:13 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* 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>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
commy2
746d384a04
Merge pull request #6976 from acemod/taking-wheels-from-invincible-vehicles
Repair - Fix taking wheels from invincible vehicles
2019-05-11 23:09:59 +02:00
commy2
588ffba0a3
Merge pull request #6987 from acemod/fix-magwells-rearm
Fix rearming for vehicles using magazine wells
2019-05-11 08:38:33 +02:00
BaerMitUmlaut
229199ba16 Fix rearming for vehicles using magazine wells 2019-05-11 01:23:33 +02:00
PabstMirror
366f49295f
Medical Blood - Small optimizations (#6984) 2019-05-08 12:50:00 -05:00
Brandon Danyluk
709548c1ef Cookoff - Fix shell detonation (#6979)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* ShotShell requires velocity to simulate itself, so always spawn it with velocity
2019-05-06 10:23:07 -05:00
PabstMirror
5da1308151
Disposable - Add warning for addons using ace_disposable (#6963)
* Disposable - Add warning for addons using ace_disposable

* update arsenal code and cba version
2019-05-06 10:05:04 -05:00
BaerMitUmlaut
3cfdae899c Add berlin wall compatibility (#6982) 2019-05-05 19:03:57 -05:00
PabstMirror
e4c9440c34
Update addons/aircraft/XEH_preInit.sqf
Co-Authored-By: commy2 <commy-2@gmx.de>
2019-05-03 19:13:54 +02:00
commy2
585e919b35 grey out scripted eject action if eject actions are hidden 2019-05-03 17:47:40 +02:00
commy2
58ece34149 manual merge 2019-05-03 17:18:32 +02:00
commy2
64e640bcf2 revert a variable 2019-05-03 17:09:16 +02:00
commy2
744b9778df temporarily re-allowDamage when using setHit(PointDamage) 2019-05-03 17:03:17 +02:00
commy2
050cd0a1f9 remove weather dependancy from winddeflection (#6975) 2019-05-03 16:56:56 +02:00
commy2
fba39bebd0 += for magwells 2019-05-03 13:07:04 +02:00
PabstMirror
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* 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>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
PabstMirror
2cfe7ebd0c
FCS - Skip adding firedEH until needed (#6965) 2019-04-27 14:04:47 -05:00
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966)
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
Dedmen Miller
50e3d8b3fe Fix macro argument counts (#6962) 2019-04-27 06:05:29 -07:00
Filip Maciejewski
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
PabstMirror
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
PabstMirror
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
PabstMirror
1f1d950588
Map - Don't enable map light for parachutes (#6961) 2019-04-25 13:27:53 -05:00
Josuan Albin
28ac653635
Merge pull request #6953 from acemod/cba-disposable-compat
compatibility with CBA disposable framework
2019-04-19 14:36:08 +02:00
commy2
07ee2c1d3d compatibility with CBA disposable framework 2019-04-19 14:33:57 +02:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func (#6937) 2019-04-16 16:47:13 -05:00
Josuan Albin
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
Josuan Albin
8fe02a455f Fix #6935 2019-04-12 14:39:28 +02:00
PabstMirror
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
PabstMirror
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
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
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
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
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
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
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
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
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
Magnetar
99f5d2ea0a
Rewrite rectify convert option (#6825)
* Rewrite Rectify - Adding option to convert vanilla medical gear

* Oops
2019-03-17 17:59:49 +01:00
Magnetar
54208a1a78
Rewrite rectify - Skip distance check if in same vehicle (#6823) 2019-03-17 17:58:43 +01:00
Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious (#6822)
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious

* Fix copy paste
2019-03-17 17:54:50 +01:00
Magnetar
82131b3643 Fix include in wrong location 2019-03-17 17:48:44 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
commy2
df8b23b9ba version check handle minor versions below 10 2019-03-16 11:05:01 +01:00
commy2
f248e81c65 version check handle minor versions below 10 2019-03-16 11:00:20 +01:00
commy2
e4391a8060
Merge pull request #6869 from veteran29/hideEjectSetting-polishTranslation
hideEjectAction - Polish translation
2019-03-15 08:23:59 +01:00
Filip Maciejewski
69b9f1e338 hideEjectAction - Polish translation 2019-03-15 00:58:12 +01:00
commy2
aef3073ee8 hide by default 2019-03-15 00:56:09 +01:00
commy2
2dbc4993d8 add setting to hide Eject action from action menu 2019-03-15 00:37:04 +01:00
PabstMirror
fb4f05e276 Prep 3.12.6 Build 43 2019-03-14 09:22:08 -05:00
PabstMirror
732368584a Merge branch 'master' into release-3.12.6 2019-03-14 09:21:14 -05:00
PabstMirror
57db905f7c
Zeus Actions - Fix config code breaking during build (#6864)
* Zeus Actions - Fix config code breaking during build

* Update addons/rearm/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, add note
2019-03-14 09:17:34 -05:00
markooff
b4639ed758 tlumaczenie_12_03_2019 (#6865)
Translations - Polish
2019-03-13 00:18:33 -05:00
PabstMirror
373f11338d Prep 3.12.6 Build 42 2019-03-12 13:35:51 -05:00
PabstMirror
88d4e32f48 Merge branch 'master' into release-3.12.6 2019-03-12 13:34:41 -05:00
mharis001
695416dfe7 Arsenal - Improvements to 3DEN attribute (#6849)
* Improvements to arsenal 3DEN attribute

* Better alignment of button

* Remove magazineGroups copy
2019-03-12 11:26:40 -05:00
Dystopian
2ff614c3a2 Safe Mode - Fix disabled laser on safety switch (#6639)
* Fix disabled laser on safety switch

* Add workaround for switching to primary weapon

* Add UGL check
2019-03-12 11:26:20 -05:00
Matsuo Yutani
842f9e5d3b Update stringtable.xml (#6860)
Updated <Portuguese> values for the Saline quantity.
2019-03-11 10:12:14 -05:00
Dedmen Miller
564fc8aa99 Trivial code fixes (#6858) 2019-03-10 21:42:08 -05:00
Dystopian
24d2aa647e Repair - Fix Typhoon rear wheel change (#6207) 2019-03-10 21:41:06 -05:00
Dystopian
56f9d76d0f UI - Fix selective UI in cargo (#6585)
* UI - Fix selective UI in cargo

* Add FFV not in cargo check
2019-03-10 21:40:28 -05:00
Dedmen Miller
51dfc081ac Fix M84 lods (#6854) 2019-03-09 20:19:58 -06:00
PabstMirror
28620d86d1
fix to weaponMuzzleVelocity (#6850)
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Add Pabst' fix to weaponMuzzleVelocity
2019-03-08 09:12:07 -06:00
Dedmen Miller
5ad8b3c6bc Arsenal - Fix incorrect muzzle velocity stat displayed on magazine (#6844)
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-03-05 10:42:04 -06:00
C0kkie
ca71375259 Captives - Use the doApplyHandcuffs function for keybind (#6843)
* Use the doApplyHandcuffs function that cabletie

* Update XEH_postInit.sqf
2019-03-05 09:40:10 -06:00
classic
c37b7644af Update Japanese translation (#6838)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
2019-02-28 13:36:34 -06:00
jonpas
6a5811a9b2 Increase required Arma 3 version to 1.88 (#6836)
No Uniform Restrictions got updated for 1.88
2019-02-27 17:44:39 -06:00
PabstMirror
4f1ce4a36f Prep 3.12.6 Build 41 2019-02-27 12:59:01 -06:00
Dedmen Miller
7f04d00b7f Add localUnits array and use that inside medical statemachines (#4836)
* Added localUnits EH

Code by @Commy2

* Init localUnits Variable

* use localUnits for medical_blood statemachine

* use localUnits for medical_ai statemachine

* Remove bracket hell

* Add Deleted EH

* Run at preInit, move to seperate file

* Handle Respawns, Filter Dead

* Add detection for Fake deleted EH

* Use a getter function

* delete all objNull at deletedEH

* Cleanup header/comments

* Move isBleeding check to inside statemachine

* opps

* debug off
2019-02-26 23:28:16 -06:00
Josuan Albin
4792e74b2b Explosives - Change SLAM magnetic to detonate upon defusal (#6827)
* Change SLAM magnetic to detonate upon defusal

* Disable explodeOnDefuseChance on SLAM timer mode
2019-02-24 14:18:01 -06:00
PabstMirror
c423e2167c
Zeus - fix script error (#6833) 2019-02-24 14:03:54 -06:00
Dedmen Miller
48f45ae27a Move SelfActions from postInit to config (#6791)
* Move zeus SelfActions to config

* Port CBA PR #1048

* Move Land_Camping_Light_off_F TurnOn action to config

* Move createModule function to script func

* Update addons/zeus/functions/fnc_canCreateModule.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Teaching it a lesson about spacing

* Update CBA: script_macros_common.hpp

* Just change admin in cba macro
2019-02-24 13:36:50 -06:00
PiZZAD0X
9e609b3394 Arsenal - Add Ability to Transfer a Loadout from Saved to Default (#6793)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Added ability to export loadout to defaultloadouts

Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand.

* Update fnc_buttonLoadoutsSave.sqf

* Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Add usage info to tooltip
2019-02-23 19:35:13 -06:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload (#6821) 2019-02-22 18:54:55 -06:00
PabstMirror
860fa0fcfa
Repair - Add condition check to progressBar (#6830) 2019-02-22 18:54:25 -06:00
PabstMirror
3ee3c5de5a
Interact Menu - Cache config actions for CAManBase (#6818)
* Interact Menu - Cache config actions for CaManBase

* Update addons/interact_menu/functions/fnc_compileMenu.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/interact_menu/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-02-22 18:54:07 -06:00
PabstMirror
191c4fb694
Disable debug on ace_common_fnc_readSettingsFromParamsArray (#6820) 2019-02-17 12:58:07 -06:00
Dedmen Miller
0c8c924487 Minedetector - Cache detectableClasses (#6805)
* Cache minedetector detectableClasses

* use compileFinal
2019-02-17 12:31:34 -06:00
Dedmen Miller
21fd4e5d16 Inventory - Cache inventory postInit config lookups (#6803)
* Cache inventory postInit config lookups

* Safety

* fix

* More better

* ugh

* add parenthesii (not trolling)

these are actually needed
```
Error in expression <_inventory_Grenades_ItemList", []];
if (!ace_inventory_Grenades_ItemList isEqual>
  Error position: <!ace_inventory_Grenades_ItemList isEqual>
  Error !: Type Array, expected Bool
```

* Add space
2019-02-17 11:41:48 -06:00
Dedmen Miller
7cce148513 Tagging - Cache tagging static models (#6804)
* Cache tagging static models

* Fix bugs, use compileFinal

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Use toLower
2019-02-17 11:41:25 -06:00
Dedmen Miller
af1cf2c7f6 Cargo - Cache cargo vehicle classes (#6806)
* Cache cargo vehicle classes to init

* fix

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix initEH being added twice for static weapons
2019-02-17 11:41:05 -06:00
Dedmen Miller
25d847ef12 Refuel - Cache refuel classes (#6807)
* Cache refuel classes

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix script errors from inner _x
2019-02-16 17:05:24 -06:00
commy2
deb7177171
Merge pull request #6815 from acemod/callCompileCleanup
Cleanup spacing on call COMPILE_FILE
2019-02-14 21:22:29 +01:00
Dedmen Miller
598738c22f Common - Use CBA addons instead of activatedAddons (#6802)
* Use CBA addons instead of activatedAddons

* Better checks

* Betterest checks

* Delay call to toLower until needed

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-02-14 12:49:56 -06:00
PabstMirror
01eabdb1df Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
PabstMirror
afd957f1e7
HuntIR - Move magwell compat to huntIR config (#6813) 2019-02-13 12:39:10 -06:00
PabstMirror
1abe622e28
Pylons - Remove ace_zeus from requiredAddons (#6808) 2019-02-11 14:19:19 -06:00
commy2
30ecfb0a71
Merge pull request #6800 from acemod/cbaAddons
Common - checkfiles use cba's list of CfgPatches
2019-02-09 14:10:10 +01:00
commy2
435ad69835
Merge pull request #6801 from acemod/100Rnd-mags-for-MXSW
add 100Rnd mags magwell to all MX variants
2019-02-09 14:09:47 +01:00
commy2
b9b45cd609 add 100Rnd mags magwell to all MX variants 2019-02-09 11:41:05 +01:00
PabstMirror
af3b8ec7fc Common - checkfiles use cba's list of CfgPatches 2019-02-08 16:39:57 -06:00
commy2
dc45072010
Merge pull request #6799 from dedmen/minedetectorPreStart
Compile minedetector scripts at preStart
2019-02-08 18:02:37 +01:00
Dedmen Miller
c9dc84d170 Compile minedetector scripts at preStart 2019-02-08 14:55:06 +01:00
mharis001
fa101d859a Pylons - Update configure pylons action (#6381) 2019-02-07 17:12:48 -06:00
PabstMirror
ff5eb34e10
Interaction Menu - Only compile self actions when needed (#6792)
* Interaction Menu - Only compile self actions when needed

* Update XEH_clientInit.sqf

* fix spellling

* format/comments

* Don't compile actions on headless servers

* Update addons/zeus/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-31 19:25:16 -06:00
Brandon Danyluk
639d3fdfa1 cfgSkeletons indentation formatting fixes (#6796)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Fix class OFP2_ManSkeleton to have proper indentation for all bones

* Fix path. Fix whitespace
2019-01-31 19:22:33 -06:00
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key (#6732)
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
2019-01-30 22:11:01 -06:00
PabstMirror
05d1c62c1f
Rearm - Fix locality issues with setMagazineTurretAmmo (#6787) 2019-01-30 18:48:40 -06:00
PabstMirror
6bee6d5cd8
Rearm - Use non-ambigious magazine names (#6761)
* Rearm - Use non-ambigious magazine names

Close #6414
Also fix missing caliber for B_20mm_AP

* Update fnc_getMagazineName.sqf
2019-01-30 18:31:01 -06:00
PabstMirror
32ffe3243c
Zeus - Paradrop Cargo (#6743)
* Zeus - Paradrop Cargo Waypoint

* move script component

* cfgpatches, localize, fix getModuleDestination call

* cleanup debug
2019-01-30 18:30:42 -06:00
Josuan Albin
8450555f0c Arsenal - Fix arsenal not working reliably on remote AI units. (#6784)
* Fix 6701

* Update addons/arsenal/functions/fnc_onArsenalClose.sqf

Co-Authored-By: alganthe <alganthe@live.fr>
2019-01-26 14:13:38 -06:00