LorenLuke
a5a8b5387a
Laser - Add Individual Laser Code Digit Control ( #9434 )
...
* Initial Commit
* Use DIK Codes
* Update headers and dev code for new default frequency
---------
2023-10-02 12:29:38 -05:00
PabstMirror
3c9d7733e8
Medical Treatment - Fix grave digging ( #9455 )
2023-10-02 11:05:56 -04:00
PabstMirror
3626b37c01
Tagging - Fix stringtable ( #9456 )
2023-10-02 11:05:13 -04:00
Drofseh
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags ( #9442 )
...
* add grave digging to body bags
* move buryBodyBag action to config, change grave ui icon to headstone
* improvements from code review
* switch direction check to man instead of bodybag, nominally allowing anything to be buried
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:55:13 -04:00
BrettMayson
66deb59037
Medical Treatment - Add event and setting for grave creation ( #9441 )
...
graves: event and setting for markers
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:31:38 -04:00
Grim
31a64a33b6
Compat SOG - Add explosives support to 1.3 mines ( #9450 )
...
* add fuse claymore
* add WP mines
* missing semicolon
* add dummy
2023-10-01 14:30:24 -04:00
Apricot
6429d0639f
Tagging - Add new colors and filled square tag ( #9443 )
...
* Adds yellow and white tags and filled square tag
Add:
Yellow Splay
White Splay
Filled Square tag for all colors
Change (and remove):
Remove color variations from the "X" strings and unify it.
Tweak some Japanese strings.
* tweak japanese
2023-10-01 13:43:03 -04:00
Drofseh
b9580a0349
Medical Treatment - Change isAwake check for grave digging to only apply to CAManBase ( #9451 )
...
* Move awake check for bodybag grave
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 13:42:07 -04:00
PabstMirror
38c79347ae
Misc - Config caplitzation fixes ( #9452 )
2023-10-01 12:09:02 -05:00
Marstruc
a8bd08136e
Medical Treatment - Add new Grave model ( #9444 )
...
* Added Grave model, swapped Grave classnames
* Change p3d name of Grave model
* Update addons/medical_treatment/CfgVehicles.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Updated grave model, textures, classname.
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-01 08:48:31 -04:00
Drofseh
dbf288851e
Medical Treatement - Don't allow conscious patients to be buried ( #9448 )
...
Don't allow conscious patients to be buried
2023-09-30 11:32:06 -04:00
Psycool
c49c5afcba
Fixed wrong strings ( #9446 )
...
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
* Korean Translation Added
Added Korean translation related to Cargo Refuel
* Merge branch 'master' of https://github.com/Psycool3695/ACE3
* Korean translation Add/Updated
* Fixed wrong strings
2023-09-29 12:27:51 -05:00
Assanali Mukhanov
537487522f
Compat SOG - Add barrel swap for MGs and belt linking for drum magazines ( #9439 )
...
* Add barrel swap support to SOG MGs
* Set SOG MG drum mags as belts, allow belt linking
* Remove tracer mag configs
Since they inherit from the "normal" magazines, these config entries, indeed, seem pointless.
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove barrel swap from RPD and M1918
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-28 15:20:46 -04:00
Grim
8e464744a1
Medical - Increase pain from bullet-inflicted bruises ( #9438 )
...
increase bruise pain
2023-09-28 15:17:42 -04:00
Krzyciu
08d0bd09c4
Translations - Add Polish Translations ( #9437 )
...
* Translations - Add Polish Translations
When merged this pull request will:
**When merged this pull request will:**
- Add missing polish translations
- Fix spelling in existing translations
### IMPORTANT
- [ ] If the contribution affects [the documentation](https://github.com/acemod/ACE3/tree/master/docs ), please include your changes in this pull request so the documentation will appear on the [website](https://ace3.acemod.org/ ).
- [x] [Development Guidelines](https://ace3.acemod.org/wiki/development/ ) are read, understood and applied.
- [x] Title of this PR uses our standard template `Component - Add|Fix|Improve|Change|Make|Remove {changes}`.
* Update stringtable.xml
---------
2023-09-27 13:54:12 -05:00
Psycool
94ceed201c
Korean translation Updated ( #9436 )
...
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
* Korean Translation Added
Added Korean translation related to Cargo Refuel
* Merge branch 'master' of https://github.com/Psycool3695/ACE3
* Korean translation Add/Updated
2023-09-27 13:28:04 -05:00
PabstMirror
03332f0019
Prep 3.16.0 Build 70
2023-09-26 16:09:34 -05:00
Björn Dahlgren
5d2c6eb948
Medical GUI - Fix cross_grave.paa
building with pboProject ( #9435 )
2023-09-26 17:01:39 +02:00
BrettMayson
d2f5c2de02
Spearhead 1944 Compatibility ( #9292 )
...
* compat(spe): initial
* --changed csw/turrets
* disable spe disassemble
* csw: all mortars done
* more cleanup
* add missing hearing protection
* final cleanup
* goofed and removed too much
* ok all done
* formatting
* remove adt
* -+ updated frameworks
- Ballistics Framework Finished (Infantry Weapons)
- Wirecutter & Trench Framework Finished (Vests/Backpacks)
- Explosives Framework Finished (Added backward support for IFA3 Detonator/Firecord)
- Crew Served Weapons Framework Finished (Fixed Assemble/Disassemble)
* formatting
* Require HEMTT v1.7.2
* cleanup tabs / formating
* Apply suggestions from code review
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
* split to subcomponents, fix ubcs
* swap has_include for skipWhenMissingDependencies
* fix explosives
* add pdumies for ww2
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* cleanup sten duplicate configs
* move hearing to macro
* fix macro repaclement
* Use `SUBADDON`
* Move `addonRootClass` to bottom of CfgPatches
* Relative includes
* move config macro includes to config.cpp
* comment off csw changes for now
* Update .hemtt/project.toml
---------
Co-authored-by: Coldfront15 <born2toot2@gmail.com>
Co-authored-by: Brett Mayson <brett@joinoffstreet.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: ZluskeN <pontux@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-09-25 15:37:59 -05:00
Grim
cf4fe835c3
Repair - Fix adding actions for hitpoints with the same name ( #9430 )
2023-09-25 20:55:23 +02:00
Grim
ac29287542
Arsenal/Compat RHS - Improve support for RHS attachments ( #9386 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-25 18:36:46 +02:00
Fabio Schick
11bc2695f5
Captives - Blindfold captive units ( #9361 )
...
* Fixed typo
* Added "Blindfold Captive" interaction
* Changed comment readability as requested
* Better handling of captive goggle replacement
if the capturer's inventory cannot contain the captive's goggles, move them to the captive's inventory, if that also can't fit them, drop them on the ground.
* Removed extra new line
* Make "validBlindfolds" a CBA Setting
* Add remaining localizations
I speak German and Italian fluently and can also infer the proper sentence structure and conjugations in French/Spanish/Portuguese, the other eastern languages are completely foreign to me though and I have to trust Google/DeepL.
* Removed non-verified translations
* Use GVAR(blindfold) config entry
* Remove unused "_state" parameter
* Check if captive isn't already blindfolded before blindfolding
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Added "remove blindfold" interaction
Co-Authored-By: johnb432 <58661205+johnb432@users.noreply.github.com>
* Correct Error Message
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Optimized duplicate code
* Apply suggestion to fix script_component includes
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-09-24 17:45:43 -04:00
Grim
aee47c9bc6
Medical - Add damage handling for explosive damage while inside vehicles ( #9246 )
...
* Add vehicle explosion handling
* Missing semicolon
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* modify condition & handling for vehicle explosion
* add vehiclehit woundHandler
* finalize
* add vehiclehit woundHandler
* finalize
* cleanup
* more cleanup
* name
* randomize hitpoints
* finalize
* don't scale structural damage
* fix undefined var
* remove _i
* fix script error, tone down scaling
* add AVD checks
* Update addons/medical_damage/functions/fnc_woundsHandlerVehiclehit.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* nuke AVD crew damage handling
* get rid of aircraft crash lethality compensation
---------
Co-authored-by: James Woods <pterolatypus@gmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-24 15:58:59 -04:00
Drofseh
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal ( #9276 )
...
* Add grave digging
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf
Co-authored-by: BrettMayson <brett@mayson.io>
* Add setting to enable/disable
* improvements
- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions
* fix typo in variable
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* add to XEH_PREP and fix event for non-local patient
* Add interaction to check name on headstone
* Update addons/medical_treatment/XEH_postInit.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Simplify Setting
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/medical_treatment/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* Make placeInBodyBagOrGrave more generic and use any grave class
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
* Update medical-treatment-framework.md
* Update docs/wiki/framework/medical-treatment-framework.md
Co-authored-by: jonpas <jonpas33@gmail.com>
* update docs
* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf
* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf
* fix includes
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-24 15:57:08 -04:00
Mike-MF
6fd24c1455
Compat WS RealisticNames - XMS ( #9429 )
...
* Compat WS - XMS
* add modified original translations
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-24 14:56:04 -04:00
Grim
77a73aee71
Backpacks - Add extra condition for backpack checking ( #9428 )
...
Update fnc_isBackpack.sqf
2023-09-24 12:06:20 -05:00
Grim
bf6dc5a7a1
Backpacks - Code cleanup ( #9409 )
...
backpacks
2023-09-24 00:13:33 -04:00
PabstMirror
0d9bcdd708
Nightvision - Fix detecting if vehicle's turret has NVGs ( #9421 )
...
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-23 21:00:04 +02:00
PabstMirror
bd0dfe4b30
compat rhs - fix SUBCSTRING
and check_strings.py ( #9424 )
2023-09-23 12:40:48 -05:00
Mike-MF
b4940e6fa3
Cargo - Improve cargo space values ( #9418 )
...
Alter Cargo values
2023-09-23 13:08:28 -04:00
Mike-MF
ab6dd0164e
Compat WS - Realistic Names ( #9419 )
...
* Compat WS - Realistic Names
* use cba subcstring
* cleanup python
* Update script_macros_common.hpp
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-23 13:07:52 -04:00
Grim
da60a1b39d
Medical Engine - Improve damage calculation for explosive-resistant armor ( #9216 )
...
* scale armor damage using passthrough
* add - to comment
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* improve condition
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove extra brackets
* fix damage sorting
* whitespace
* comment
* fix function header
* fix infinite armor when no item equipped
* cleanup
* more cleanup
* name
* don't scale structural damage
* add setting
* fix key name
* add cap to passThrough
* fix script error in setting
---------
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-09-23 13:07:06 -04:00
Grim
ec96cdf12c
Medical Treatment - Fix clearing trauma after stitch with multiple wounds ( #9420 )
...
fix clear trauma on stitch
2023-09-23 12:59:10 -04:00
PabstMirror
d8eb97f4ec
Tools - Fix configs for hemtt1.9.0 ( #9423 )
2023-09-23 11:37:41 -05:00
Grim
0ba67ea173
Optics - Add items to new vanilla rails ( #9410 )
2023-09-22 18:10:22 +02:00
PabstMirror
0b695be841
Laserpointer - Block switching to unsupported visible lasers ( #9416 )
2023-09-22 18:09:46 +02:00
Will/KJW
51e6134b71
Grenades - Improve flashbang sound ( #9415 )
2023-09-22 18:08:34 +02:00
Mike-MF
5eab95d984
Casings - Add Western Sahara Casings ( #9417 )
...
* Add WS Casings
* Minor formatting fix
2023-09-22 12:03:07 -04:00
Jasper
6f58830603
Common - Add lockInventory status effect ( #9402 )
...
Add lockInventory status effect
2023-09-22 12:02:09 -04:00
johnb432
11664b0040
Dragging - Improve featureCamera
handling ( #9389 )
...
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Update XEH_postInit.sqf
* Different approach
* Updated to new script_component
* fix variable lookup
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-19 23:56:20 -04:00
Grim
37be6130f2
RHS Compat - Readd basic 5.56 suppressor to 5.56 muzzle slot ( #9412 )
...
bleh
2023-09-19 23:13:38 -04:00
Grim
bd4d1a7a50
IR Lights - Fix visible pointers for DBAL ( #9414 )
...
* fix dbal visible pointer
* fix dbal visible pointer
* remove unused macro
* tweak numbers, move define to single file
* change max range
2023-09-19 22:55:15 +02:00
Grim
b84a84c0ff
Laser Pointer - Use engine method for visible lasers ( #9411 )
...
* initial commit
* tweak numbers
* nuke framework
* cleanup JR
2023-09-19 15:29:13 -04:00
johnb432
748f9aff31
Dragging - Enabled dragging whilst limping ( #9379 )
...
Enabled dragging whilst limping
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-09-18 22:43:10 -04:00
BaerMitUmlaut
d6faac5881
Add IR Flashlights ( #6563 )
...
* Initial IR flashlight tests
* More experiments
* Rewrite using engine IR lights
* Rework ranges, fix bugs, add docs
* Fix uncommented DISABLE_COMPILE_CACHE
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Markdown fixes
Co-authored-by: jonpas <jonpas33@gmail.com>
* Use baseWeapon instead of custom property
* Add baseWeapon to SPIR
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-17 09:32:39 +02:00
johnb432
a0dd4400e6
Cargo - Fix/Improve FUNC(paradropItem) ( #9399 )
...
paradropItem fixes
2023-09-14 17:54:06 -04:00
Grim
f7b520b56b
Markers - Fix issues with custom channels ( #9383 )
2023-09-13 05:05:42 +02:00
johnb432
7a3e5dd3e0
Dragging - Add config support for weight ignoring ( #9396 )
...
* Update fnc_initObject.sqf
* Update dragging-framework.md
2023-09-12 18:57:55 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp
includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
jonpas
7cbdb7f410
General - Use subcomponent macro (CBA 3.16.0) ( #9375 )
2023-09-12 20:40:38 +02:00
Pepijn Holster
ea783b6c7a
Advanced Ballistics - Fix _mapSize
sometimes 0 by using engine command ( #9394 )
...
Update fnc_initializeTerrainExtension.sqf
2023-09-12 13:04:06 -05:00
johnb432
119702a189
Zeus - Fix Group Side module ( #9388 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-12 17:41:38 +02:00
Krzyciu
4a12f61352
Translations - Add Polish Translations ( #9391 )
...
Translation - Add Polish Translation
When merged this pull request will:
Add Missing Polish Translations
Fix Spelling in existing translations
2023-09-11 21:33:48 -05:00
PabstMirror
07ab8751a6
XM157 - Fix spin drift offset when using advanced ballistics ( #9392 )
...
xm157 - Fix spin drift calc when using ab
2023-09-11 20:44:25 -05:00
Nilia119
4ce6fcb3cc
Translation - Add German Translation ( #9390 )
...
Added German Translation
2023-09-11 20:37:20 -05:00
johnb432
5b1491278d
Dragging - Fix for #9385 ( #9387 )
2023-09-11 14:29:56 +02:00
Grim
de8940af9b
Medical Treatment - Add setting to rollover bandage effectiveness ( #8426 )
...
* use leftover bandage effectiveness on other wounds in same limb
variable naming
* Comments
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
* variable naming, fix part index check in findMostEffectiveWound
trace 4
* fix function header
* Account for multiple wounds in time calculation
* fix trace, remove systemChat
* update for hashmaps
* compile cache
* Update addons/medical_treatment/functions/fnc_findMostEffectiveWounds.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* add bandage effectiveness setting
* stupid
* remove limit on bandageRemaining
* Update addons/medical_treatment/functions/fnc_bandageLocal.sqf
Co-authored-by: BrettMayson <brett@mayson.io>
* Update fnc_getBandageTime.sqf
* Update fnc_bandageLocal.sqf
* fix header / debug
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Kyle Mckay <5459452+kymckay@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-10 02:06:15 -04:00
PabstMirror
29ba42bfb5
Markers - Don't try to move poly-line markers ( #9381 )
2023-09-09 16:29:57 -05:00
Grim
56e905ab7a
Fire - Fix macro ( #9376 )
...
Update fnc_burnReaction.sqf
2023-09-09 02:24:41 -04:00
Broström.A | Evul
eaea6f29b8
Medical - Add setting to drop weapon on unconsciousness ( #8433 )
...
* added chance of dropping weapon on unconsciousness
* Moved throwWeapon to common
* Fixed spelling error
* wording changes
* typo
* fix usgae in burn reaction
* Update addons/medical_status/stringtable.xml
* Update addons/medical_status/functions/fnc_setUnconsciousState.sqf
* Update addons/medical_status/stringtable.xml
* move condition
* derp
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-09 02:17:24 -04:00
Grim
dbd5fbaf31
Medical - Add internal variable for wake-up timer and stable blood volume ( #9374 )
...
* Medical - Allow changing SPONTANEOUS_WAKE_UP_INTERVAL via var
* add variable for minimum blood volume
* change variable name
* update pain comment
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-09 00:15:43 -04:00
PabstMirror
f644e7516c
Compats - Make rest of compats auto load if mod present ( #9372 )
...
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-08 16:57:33 +02:00
PabstMirror
c163d6d53a
Laserpointer - Block laser attachments if setting disabled (CBA 3.16.0) ( #9346 )
...
* Laserpointer - Block laser attachements if setting disabled
req https://github.com/CBATeam/CBA_A3/pull/1595
* Apply suggestions from code review
* Update addons/main/script_mod.hpp
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-07 14:05:24 -05:00
Grim
017e097ac4
Advanced Fatigue - Fix metabolic cost mass multiplier for walking ( #9368 )
...
4 -> 2
2023-09-07 00:42:33 -04:00
Grim
c2ab5a24bc
Night Vision - Change Apex and Wide NVGs to Gen 4 ( #9369 )
...
make Apex and Wide NVGs gen 4
2023-09-06 20:44:30 -04:00
PabstMirror
25b8fd6d54
Medical AI - Add setting to require items for treatment ( #9362 )
...
* Medical AI - Add setting to require items for treatment
* all ivs
* invert setting
* Update addons/medical_ai/stringtable.xml
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* move item hash to preStart
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:37:26 -04:00
Grim
f75d237d47
Tagging - Fix tagModel not being utilized for custom tags ( #9366 )
...
fix tagModel
2023-09-06 12:20:04 -04:00
jonpas
576e6b7d55
Compat WS - Add No Uniform Restrictions subconfig ( #9365 )
...
* Compat WS - Add No Uniform Restrictions subconfig
* Update addons/compat_ws/compat_ws_nouniformrestrictions/config.cpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-06 12:03:20 -04:00
Grim
99c7bea6fe
Compat GM - Make compat autoload when mod is present ( #9364 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-06 02:33:13 +02:00
PabstMirror
9d745da465
Compats - Use 2.14 skipWhenMissingDependencies
( #9363 )
2023-09-06 02:32:44 +02:00
Grim
aa107ed517
Medical - Add treating with items from vehicle inventory ( #9286 )
...
* allow pulling items from vehicle inventory
* use vehicle items first
2023-09-05 11:20:56 -03:00
jonpas
938f421ac3
AI - Add automatic NVG equip/unequip ( #9313 )
...
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-05 16:20:06 +02:00
Mike-MF
5417a18d7f
Compat WS - Make compat auto load if DLC is present ( #9205 )
2023-09-05 16:19:09 +02:00
Grim
88e0c8f27b
Common - Improve FUNC(removeSpecificMagazine)
with 2.14 changes ( #9227 )
2023-09-05 16:14:42 +02:00
PabstMirror
03c3e74636
Maptools - Cleanup pre-2.14 compatibility code ( #9342 )
...
ref #9219
2023-09-05 10:38:38 -03:00
Will/KJW
e3d6d6cc4e
Fastroping - Remove 2.12 compatibility ( #9329 )
...
Update fnc_deployAIWaypoint.sqf
2023-09-05 10:37:56 -03:00
johnb432
c11e7690bf
Arsenal - Remove redundant fix for hand guns and binoculars with secondary muzzles ( #9305 )
...
Update fnc_onSelChangedRight.sqf
2023-09-05 10:37:02 -03:00
Dystopian
10ffcea9b7
Optionals - Add No Medical and No Realistic Names components ( #8187 )
...
* Add nomedical and norealisticnames components
* Add fire component disabling
* Make it work
* remove headlight skipping
* update preprocess syntax
* fix git screwup
* Apply suggestions from code review
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-09-03 21:56:54 -04:00
Grim
36f34ec551
Medical - Add 'Open (Backpack)' action to dead units ( #9239 )
...
* add open bag interaction
* only add actions to uncon/dead
* improve assembly backpack check
* Fixes
* Removed test code
* move to postInit
* fix locality
* locality edge case
* Fix double actions on dead units
* improve comment
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 21:48:09 -04:00
Grim
e5a49f3acf
Compat RHS - Make compats autoload if mod is present ( #9294 )
...
* autoload RHS USAF compat
* whoops
* fix filepatching builds
* pboProject pls
* add ONE semicolon.
* remove meta.cpp
* add AFRF, move stringtables
* add addon.toml
* stringtable validation
* change subconfig folder names for stringtables
* macros
* sigh
* macros
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* add SAF compat
* missing file
* config brackets
* Update addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/config.cpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/compat_rhs_usf3/compat_rhs_usf3_csw/CfgVehicles.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* capitalization
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* fix double class
* gref and fastroping
* fix functions
* Update CfgVehicles.hpp
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 11:36:19 -05:00
Filip Maciejewski
a7d8c3eb3a
Compat SOG - Make compat auto load if DLC is present ( #9204 )
...
* Move SOG compat to addons/
* Set component to skip loading when SOG not present
* Use skipWhenMissingDependencies for GRAD Trenches compatiblity
* Tools - Add SOG dlc launch config
* move trenches to sub config, handle grad with 2nd subconfig
* fix `Land_vn_b_prop_fueldrum_01` UBC
* use ifndef
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-03 11:31:45 -05:00
Björn Dahlgren
1a3bce1a23
Add compatibility mod for CSLA CDLC ( #8839 )
...
* Add compatibility mod for CSLA CDLC
* Fix syntax issue
* Add open bolt property to machine guns
* Move to addons and update UBC
* Update addon.toml
* Update addons/compat_csla/CfgWeapons.hpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/compat_csla/CfgMagazines.hpp
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* split explosives to sub config
* ifndef
* reduce range on stinger backblast (is soft-launch)
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-03 11:31:26 -05:00
Grim
cc26f00df3
Common/Adv. Fatigue/Medical - Add unified sway calculation ( #9226 )
...
* fix adv fatigue sway interaction with medical
* change medical sway scaling
* move to common
* function header
* number tweaks
* baseline is always at least 1
* Add error msgs and warn if using old ACE_setCustomAimCoef
* Update addons/common/functions/fnc_addSwayFactor.sqf
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-02 18:09:19 -04:00
Grim
8439a931e4
Gunbag - Add check for weapon in virtual items on loadout set ( #9358 )
...
* add check for weapon in arsenal virtual items
* fix variable
Co-authored-by: BrettMayson <brett@mayson.io>
* add INFO
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-01 17:52:45 -03:00
Will/KJW
beb4ec8f06
Explosives - Add modded defusal kit support ( #9353 )
...
* Update CfgWeapons.hpp
* Update XEH_preStart.sqf
* Update XEH_preInit.sqf
* Update fnc_canDefuse.sqf
* Update fnc_canDefuse.sqf
* fix condition
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update fnc_interactEH.sqf
* Update addons/explosives/functions/fnc_interactEH.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-01 17:52:28 -03:00
Apricot
c1c1433c44
Translations - Improve and Add Japanese ( #9357 )
...
* update japanese
* full-width to half-width
* more tweak
2023-08-31 11:24:35 -05:00
Grim
8f24884f73
Arsenal - Use regex matching for searchbars (multi-word searching) ( #9348 )
...
* use regex
* remove extra brackets
* add regex pattern, change refill condition
* add missing quote
* change pattern again
* bleh, we'll just go with this
* use pattern quote (thanks veteran)
* remove comment
* use escapeRegex function
* add regex to 3DEN attribute
2023-08-30 19:41:35 -04:00
Grim
8b3b265d87
Common - Add FUNC(escapeRegex)
( #9355 )
...
* add function
* add source
2023-08-30 19:31:10 -04:00
Will/KJW
c88695fb82
Captives - Add modded cable tie support ( #9350 )
...
* Update fnc_canApplyHandcuffs.sqf
* Update fnc_canApplyHandcuffs.sqf
* Update fnc_doApplyHandcuffs.sqf
* Update XEH_preStart.sqf
* Update fnc_doApplyHandcuffs.sqf
* Update fnc_canApplyHandcuffs.sqf
* Update XEH_preInit.sqf
* Update fnc_doApplyHandcuffs.sqf
stray bracket
* Update addons/captives/XEH_preStart.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update CfgWeapons.hpp
* Update CfgWeapons.hpp
* Update fnc_canApplyHandcuffs.sqf
* Change to restraints
Update XEH_preInit.sqf
* Update XEH_preStart.sqf
* Update fnc_canApplyHandcuffs.sqf
* Update fnc_doApplyHandcuffs.sqf
* Update CfgWeapons.hpp
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-30 17:03:44 -04:00
PabstMirror
bee0362921
Hellfire - Add support for MELB hardpoint (1x) ( #9352 )
2023-08-30 12:44:43 -05:00
PabstMirror
fdb7330385
Arsenal - Add stat to show how AI will use ammo ( #8434 )
...
* Arsenal - Show AI Usage
* Add condition and move to ballistics
* Add stringtables
* add getVar
2023-08-29 14:34:24 -05:00
PabstMirror
e6a8222966
Map - Update map lighting effect every frame ( #9349 )
...
Map - Update lighting effect every frame
2023-08-29 12:32:44 -03:00
johnb432
528539210e
Reload/Reload Launcher - Fix headers ( #9347 )
...
Header fixes
2023-08-28 17:20:53 -03:00
johnb432
b90d0379ca
Reload Launcher - Improve various aspects ( #9335 )
...
* Add notifications to reloadLauncher
- Add notifications to reloadLauncher
- Also set _reloadTime to `magazineReloadTime min 2.5` instead of just 2.5 if there is no `buddyReloadTime` set
* Change message format
* Add setting displayStatusText for reloadLaunchers
* reloadlauncher improvements
* Comments
* Updated so it's similar to reload addon
* Added failure message
* Update addons/reloadlaunchers/functions/fnc_reloadLauncher.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Changed reload conditions
* Tweaked notifications
---------
Co-authored-by: Drofseh <Drofseh@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-28 15:14:45 -03:00
johnb432
59ee36560f
Reload Launchers - Code cleanup ( #9334 )
...
* reloadlaunchers cleanup
* Update fnc_canLoad.sqf
2023-08-28 14:27:01 -03:00
johnb432
44e0fdb6fa
Reload - Code cleanup and various improvements ( #9343 )
...
* Reload code cleanup
* Update fnc_startLinkingBelt.sqf
* Update addons/reload/functions/fnc_getAmmoToLinkBelt.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-28 14:26:24 -03:00
johnb432
519b1cbeb4
Repair - Improve wheel repair interaction position ( #9345 )
...
Update fnc_addRepairActions.sqf
2023-08-28 09:52:21 -03:00
johnb432
0bee7614ad
Common - Improve weapon unloading ( #9344 )
...
Fix weapon unloading
2023-08-26 12:04:31 -04:00
PabstMirror
582f6e32ed
Slideshow - Add support for maps as textures ( #9150 )
...
* Slideshow - Add support for maps as textures
* Update script_mod.hpp
* Update fnc_mapImage.sqf
* cleanup
* Update fnc_mapImage.sqf
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* mapImage_init comments
* Update fnc_mapImage.sqf
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* add support for mission config maps
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-25 10:33:42 -05:00
PabstMirror
65d5ccf600
Medical GUI - Dynamically create any number of action buttons ( #9332 )
...
* Medical Gui - Dynamically create any number of action buttons
* Fix right alignment, add h-spacing, fix 2.14 select
2023-08-25 10:32:39 -05:00
PabstMirror
59fa842527
Map Tools - Fix for 2.14 aspect ratio changes ( #9219 )
...
Close #9176
2023-08-25 10:25:00 -05:00
olimolly
6c0797eaa2
Add french translation for new painUnconsciousTreshold setting ( #9341 )
2023-08-24 09:37:13 -05:00
JonBons
2709490efd
Cookoff - Move canHaveFireJet logic into vehicle_damage ( #9060 )
...
* Moved ace_cookoff_canHaveFireJet config logic into vehicle_damage as a param passed into cookoff to improve modularity
* Use original arg order
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-23 12:37:17 -05:00
PabstMirror
8e25472d5b
Night Vision - Use default effects when controlling UAVs ( #9338 )
2023-08-21 14:23:53 -05:00
PabstMirror
fabd9c5fdb
Weather - Fix number in fnc_calculateWindChill.sqf
( #9340 )
...
Update fnc_calculateWindChill.sqf
2023-08-21 14:23:21 -05:00
Grim
d33a158e2e
Arsenal - Favorites System ( #9307 )
...
* improve page handling
* drop MAX_STATS_PER_PAGE for now
* hide stats box when empty
* improve hiding
* improve _fnc_hideUnused
* condition
* prevent page overflow
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* favorites var
* function prep
* favorites only
* improve favorites adding, add include
* fix stupid
* fix color setting (todo: lnb color)
* add button, finalize
* setting tooltip
* stringtable again
* fix setting overwrite, improve tooltip
* fix losing weapon items
* fix macro
* fix setting to intended overwrite
* remove unnecessary private
* docs
* more docs
* is
* improve button text
* docs
* fix tooltip not showing unless menuBar was clicked
* improve weapon accessory lookup
* empty line
* update refresh calls
* fix left panel
* cleanup currentCargo
* use BI string for favorites
* BI strings again
* no favorites for face/voice/insignia
* stringtable again
* add missing setColorRight
* Add comment for favorites setup
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-19 23:56:59 -04:00
Grim
2f8d92701f
Arsenal - Fix magazine misc items categorization ( #9336 )
...
fix stupid
2023-08-20 00:43:22 -03:00
Grim
8f3a1c5694
Arsenal - Fix changing stats via script ( #9312 )
...
* fix addStat
* fix removeStat
* improve priority sorting
* change append to pushBack
2023-08-19 22:45:07 -04:00
Grim
007995612d
Arsenal - Fix virtual non-weapon magazines in inventory being treated as unique ( #9309 )
...
* sigh
* add comment in scanConfig
* fix misc magazines
* improve magazine misc items check
* check player loadout first for uniqueItems
2023-08-19 22:38:06 -04:00
PabstMirror
4b7ee55588
Nametags - Cleanup unused crew info component ( #9333 )
2023-08-19 21:20:27 -05:00
Grim
42101e8fa2
Fastroping - Fix equipping FRIES during vehicle init ( #9299 )
...
* delete fries with vehicle
* FUNCK -> FUNC
* Delay 1 frame so setVar won't fail if ran before initpost
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-19 01:38:47 -04:00
johnb432
682ae05f59
Medical Status - Remove status effects upon death/featureCamera ( #9301 )
...
* Update fnc_handleKilled.sqf
* move to function
* Removed skipSetHidden
* Revert "Removed skipSetHidden"
This reverts commit 452c5216a7
.
* Update addons/medical_status/XEH_postInit.sqf
* add comment, force git to run actions
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-18 13:16:20 -04:00
Grim
55cc755542
CSW - Disable non-CSW rearm actions for CSW vehicles ( #9255 )
...
* improve CSW integration
* do this more cleanly
* code style
* revert ammo handling check change
2023-08-18 13:10:15 -04:00
johnb432
a168330550
Arsenal - Add arsenal actions addition and removal via functions ( #9318 )
...
* Add and remove arsenal actions via functions
* Fixed header
* Update addons/arsenal/functions/fnc_addAction.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update fnc_addSort.sqf
* Update addons/arsenal/functions/fnc_removeAction.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/arsenal/functions/fnc_removeAction.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-18 12:33:56 -04:00
PabstMirror
d290ca3d63
Aircraft - Use COMPILE_SCRIPT
macro ( #9331 )
2023-08-17 21:52:29 +02:00
Kyle Mckay
e47e18001f
Docs - Update my display name everywhere ( #9330 )
...
* Update display name in team
* Update display name everywhere
* order
https://youtu.be/VYycQTm2HrM
---------
Co-authored-by: BrettMayson <brett@mayson.io>
2023-08-17 12:02:17 +02:00
Bailey Danyluk
ef23310aec
Docs - Change name (again) ( #9328 )
2023-08-16 19:18:01 -04:00
PabstMirror
8517a6ef73
Fastroping - Add compatibility with 2.12 ( #9327 )
...
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-08-16 21:00:52 +02:00
Will/KJW
3e35984610
Medical GUI - Improve Selected Category colouration ( #9324 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-08-16 20:32:53 +02:00
jonpas
0cef0ba6e9
Fastroping - Add Auto add FRIES setting ( #9319 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-08-16 14:16:44 +02:00
Will/KJW
9abb43ad3a
Fastroping - Improve AI flight height ( #9270 )
...
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-16 14:16:29 +02:00
Mike-MF
9bcd990dd0
Nightvision - Add White Phosphor NVGs ( #9321 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-16 14:15:53 +02:00
jonpas
43cded706c
Interaction - Use assignTeam
instead of deprecated CBA event ( #9326 )
2023-08-16 14:15:44 +02:00
PabstMirror
8c5ab18350
Various - Misc Cleanup ( #9317 )
...
* Various - Misc Cleanup
* Update addons/common/functions/fnc_canDig.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-08-13 14:13:02 -05:00
Grim
7c70ded9bc
CSW - Fix mag multiplication in multiplayer ( #9232 )
2023-08-12 21:31:30 +02:00
Grim
fdbcc62c74
Repair - Make headlights repairable ( #9306 )
2023-08-11 19:44:12 +02:00
PabstMirror
eb53e7a2fe
Tools - document_functions.py: handle header sub indexs for arguments ( #9303 )
...
* tools - handle header sub indexs for arguements
* convert remaining
* Update coding-guidelines.md
2023-08-08 22:51:20 -05:00
johnb432
f941e0217b
Arsenal - Improve sorting ( #9314 )
...
Tweaked arsenal sorting
2023-08-09 06:25:18 +03:00
johnb432
8d7cc09586
Arsenal - Fix unique explosives showing up in the "all magazines" tab ( #9308 )
...
Check all magazines last
2023-08-05 22:07:19 +03:00
Sergey Vergun
96a4a8cf8e
Medical - Add Pain Unconscious Threshold setting ( #8394 )
...
* Add PAIN_UNCONSCIOUS slider
Add PAIN_UNCONSCIOUS slider to ACE Medical settings
* fix GVAR name
* Update addons/medical_damage/stringtable.xml
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
* Update addons/medical_damage/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com>
* stringtable
* remove setter in preInit and cleanup PAIN_UNCONSCIOUS_DEFAULT
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-08-05 15:32:21 +03:00
johnb432
a591aa9508
Advanced Fatigue - Add cap to muscle damage ( #9302 )
...
Update fnc_mainLoop.sqf
2023-08-04 21:07:12 -05:00
PabstMirror
6fb9161ecc
Medical Engine - Fix unloading dead units in vehicles and handle deleted units vehicles ( #9283 )
...
* Medical Engine - Unlock when dead
* Update fnc_unloadPersonLocal.sqf
* Update addons/common/functions/fnc_unloadPersonLocal.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* fix actually unloading people to found emptyPos
* handle deleted units
* handle dead units
ref 179957c39d
* vehicle -> objectParent
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-08-02 08:59:46 +03:00
johnb432
6bc1ae453b
Update fnc_loadUnit.sqf ( #9300 )
2023-08-01 11:35:55 -05:00
Grim
628d62d329
Laser - Cleanup laser designator config and code ( #9289 )
...
* cleanup laser designator code
* condition
* use macro for IDC
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* IDC to macro
* switch to _currentShooter
* hide CA_Distance even if fade fails
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-30 04:41:46 +03:00
Dystopian
14e92dfb7f
Repair - Add enable setting ( #8070 )
...
* Add enable setting
* Optimize eden expressions
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Add debug
* Update addons/repair/functions/fnc_addRepairActions.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fix strange indent
* Optimize bool to number conversion
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Prevent run before setting is ready
* Move postInit to EH
* remove all transportRepair = 0
* remove requiredAddons
---------
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-29 07:53:05 +03:00
johnb432
7ef9d19bc5
Update fnc_replaceUniqueItemsLoadout.sqf ( #9297 )
2023-07-29 01:01:42 +03:00
johnb432
add312cbf1
Logistics wirecutter - Add wirecutter stats to ACE arsenal ( #9296 )
...
* Added wirecutter stats to arsenal
* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/logistics_wirecutter/ACE_Arsenal_Stats.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update ACE_Arsenal_Stats.hpp
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 01:01:25 +03:00
Grim
2f0ed27d93
Arsenal - Improve stats display ( #9290 )
...
* improve page handling
* drop MAX_STATS_PER_PAGE for now
* hide stats box when empty
* improve hiding
* improve _fnc_hideUnused
* condition
* prevent page overflow
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 01:00:05 +03:00
Grim
4fea9669bb
UI - Fix UAVs not being considered vehicles for HUD elements ( #9288 )
...
* consider UAVs as vehicles for UI display
* fix condition
* readd reload ui condition
* improved UAV check
* use getConnectedUAVUnit
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-29 00:44:14 +03:00
Dystopian
0321545098
Rearm - Add enable setting ( #8067 )
...
* Add enable setting
* Update test
* Optimize eden macro
* Fix bad command name in eden
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* Cleanup unused argument
* Handle RHS config
* Optimize init function a little
* Improve macro
Co-authored-by: jonpas <jonpas33@gmail.com>
* compats and leftovers
* function header (sorry jonpas)
* add enabled check to initSupplyVehicle
* use toString
* fix validate
* inheritance cleanup
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 12:47:23 +03:00
Grim
93520bdc9d
Arsenal - Add and Improve stats ( #9291 )
...
* add nv and magnification stats
* improve ballistics conditions
* add ammo count stat
* Update addons/arsenal/ACE_Arsenal_Stats.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/nightvision/ACE_Arsenal_Stats.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* cleanup
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-28 10:05:12 +03:00
Grim
5e6476aa5a
Arsenal - Make Zeuses able to save, delete, and edit Default Loadouts ( #9278 )
...
* allow zeus to edit default loadouts
* typo
2023-07-28 07:55:10 +03:00
Grim
12905a0702
Arsenal - Fix #9040 bugs/regressions ( #9293 )
...
* fix saving loadout with weapon in container
* readd magazine refill
2023-07-28 07:53:53 +03:00
LorenLuke
2578ead13b
Laser - Add Aircraft Laser Spot Tracker and Point Locking ( #8453 )
...
* Initial commit
* optimize/clean, add ignoreOwners param
* locality, PFH condition
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 07:03:02 +03:00
Tim Beswick
cd36871f90
Repair - Fix bug in detection for ignoring hitpoints ( #9261 )
...
* Fix bug in detection for ignoring repair hitpoints
* Use define for array any
* Add warning if hitpoint group would be ignored
* Apply suggestions from code review
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Change ANY to ANY_OF
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-28 06:32:30 +03:00
LorenLuke
18551144bd
Map Tools - Add Vernier Scale and Improve resolution ( #8674 )
...
* Adds 4mil Vernier scale to large and small maptools.
* Updates aligned images, adds 2 mil vernier scale.
* Changes vernier scale from cyan to red.
* Increased map tool resolution to 4K
* fix mips
---------
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 05:27:24 +03:00
johnb432
174841751c
Arsenal - Improve support for unique equipment ( #9287 )
...
* work on arsenal actions
* cycle through pages
* docs
* cleanup
* Update addons/gunbag/functions/fnc_weaponName.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* missing fil
* Update addons/arsenal/functions/fnc_itemInfo.sqf
* Update addons/arsenal/functions/fnc_refresh.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove CBA_loadoutSet gunbag cache
* update fnc_refresh
* Added unique item support for left panel items
* Cleanup
* fix 3den
* add scopeEditor
---------
Co-authored-by: Brett <brett@mayson.io>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:41:15 +03:00
BrettMayson
3edeff217a
Arsenal - Action Buttons ( #9069 )
...
* work on arsenal actions
* cycle through pages
* docs
* cleanup
* Update addons/gunbag/functions/fnc_weaponName.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* missing fil
* Update addons/arsenal/functions/fnc_itemInfo.sqf
* Update addons/arsenal/functions/fnc_refresh.sqf
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* remove CBA_loadoutSet gunbag cache
* update fnc_refresh
* fix 3den
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-25 09:30:49 +03:00
PabstMirror
74984769a5
Tagging - Add custom stencil text tags in 3DEN ( #9149 )
...
* Tagging - Add custom stencil text tags
* hack to force preloading font
* Add 3den
* header
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* Update addons/tagging/functions/fnc_generateStencilTexture.sqf
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-24 05:55:39 +03:00
Grim
e9cde7268f
skip removing clan tag if spray painted ( #9285 )
2023-07-24 02:23:13 +03:00
johnb432
dbe372cb48
Dragging - Improve code ( #9271 )
...
* Code cleanup
* Moved keybinds to initKeybinds.sqf
* Update addons/dragging/initKeybinds.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/dragging/functions/fnc_carryObject.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/dragging/functions/fnc_getWeight.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Rephrasing and adjustments for dragging
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-24 02:07:37 +03:00
johnb432
f070e3ff30
Added handling of captivity when dragging/carrying ( #9284 )
2023-07-23 07:49:08 +03:00
Grim
1011b963bc
fix losing interactions with notepad open ( #9282 )
2023-07-23 07:48:53 +03:00
BaerMitUmlaut
52ed0fc6be
Medical Engine - Prevent automatic unloading of dead or unconscious units ( #7959 )
...
* Lock seats of unconscious or dead units
* disable pullOutBody if medical is loaded
* fix undefined var and switch to objectParent
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-22 09:41:20 +03:00
Grim
4f4389dd59
Common - Fix loading units into FFV cargo seats ( #9280 )
2023-07-22 09:12:42 +03:00
Grim
39e4f9340b
Common/Medical - Change vehicle
checks to objectParent
( #9281 )
...
* switch to objectParent
* use objectParent in unloadUnit
* fix derp
* allow unload patient on dead units
2023-07-22 09:11:58 +03:00
johnb432
9505d4c47e
Dragging - Fix unintended Cargo dependency and improve ragdoll/disconnection handling ( #9272 )
...
* Improvements
* fix unintended cargo dependency
* stringtable
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-22 07:01:30 +03:00
PabstMirror
9d1b696480
Arsenal - Fix adding inventory item with empty name to dummies ( #9279 )
...
* Arsenal - Fix adding inventory item with empty name to dummies
* Update XEH_postInit.sqf
2023-07-22 06:32:15 +03:00
Grim
35ce8d1883
Common - Add variable to block item replacement temporarily ( #9265 )
...
* add blocking item replacement
* don't add if player changed
* re-curse instead of fake item
* compileFinal
* Update fnc_registerItemReplacement.sqf
* move to separate function
* remove fakeitem replacement
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-22 06:31:30 +03:00
Grim
e5dc124fe8
Dragging - Add additional weight checks on inventory modification ( #9225 )
...
* Allow run when carrying light-weight objects
* Use global var instead of macro
* add weight check, improve getWeight & conditions
* changes from review
* changes from review - postInit
* add param to ignore PhysX mass
* add settings
* BI issue tracker in comment
* change defaults, remove overweight setting
* remove public variable
* setting name changes
* updating case in statusEffect_addType
* move to XEH
* derp
* Add some extra checks for closed events
* Update XEH_postInit.sqf
* conditions
---------
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-22 06:30:40 +03:00
Grim
31e1ad0cff
Arsenal - Add Tools category and moveOnOverwrite
parameter to FUNC(addCustomRightPanelButton)
( #9247 )
...
* add tools tab and setting
* move to preinit
* fix icon, add restart warning
* derp
Co-authored-by: Dystopian <sddex@ya.ru>
* Update addons/arsenal/stringtable.xml
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* remove setting
* add keepIfOverriden parameter
* docs again
* documentation whitespace
* docs grammar, change parameter name
* fix docs
* more docs fixes
* magazine support
* deprecate spare barrel item
* more docs, improve condition
---------
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 22:39:48 +03:00
johnb432
c8404f496e
Arsenal - Add/Fix/Improve/Change numerous aspects ( #9040 )
...
* Arsenal update
* Fixes
* Update fnc_onSelChangedLeft.sqf
* Update fnc_updateUniqueItemsList.sqf
* Header fixes
* Fix for defines.hpp
Co-authored-by: Dystopian <sddex@ya.ru>
* Moved fnc_baseWeapon, filtered invalid items
* Update addons/arsenal/functions/fnc_scanConfig.sqf
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Fixes and tweaks
- Sorting is guaranteed to give a fixed order
- Dog tags no longer throw errors when reloading the ACE arsenal mission when you had some saved in your loadout before quitting the last time you played.
* Cleanup, bug fixes and additions
- Added the ability to add items from "CfgMagazines" into the "Misc. items" or custom tabs.
- Added "baseWeapon" class support for weapon attachments. If a weapon attachment has the config property "baseWeapon" defined, it will take that item and show that in the arsenal.
- Added stronger filtering on item scopes (scope > 0 at least for every item)
- Added "descending" (default, as it is now) and "ascending" sort order as a drop down menu,
- Unique backpacks in containers can now be removed with either the "-" or "clear all items" button.
- When sorting by a number, 2 decimal points have been added, so that when you sort by weight it returns the correct order.
* More fixes and tweaks
- Converted the arsenal to partially work with hashmaps instead of arrays (for configItems and virtualItems, currentItems is still an array).
- Because of the above, performance of FUNC(addVirtualItems) and FUNC(removeVirtualItems) has improved immensely.
- Sorting now caches results, reducing repeated sorting times drastically.
- CBA disposable launchers are handled differently now: Within the arsenal, you can change weapon attachments on disposable launchers, but you can't change their magazines (primary or secondary). Item info on the right and the stats show correct information.
- FUNC(addSort) now checks if the new sorting method already exists and doesn't add it if it does.
- FUNC(removeSort) now exists. You can't remove the default sort type (alphabetically) to avoid problems with the arsenal.
- Both FUNC(addStat) and FUNC(compileStats) actually taken priority into account now. Because of that priority on several stats needed to be tweaked.
- FUNC(removeStat) ensures that there are no gaps within the stat array (so if there is an empty spot in the stats page, it's because there is a stat, but the condition for it being shown hasn't been met).
* Update fnc_replaceUniqueItemsLoadout.sqf
* Update fnc_onSelChangedLeft.sqf
* Update fnc_scanConfig.sqf
* Update docs/wiki/framework/arsenal-framework.md
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Minor cleanup
* Baseweapon filtering
* Improvements + better unique items support
* Update fnc_fillRightPanel.sqf
* Update fnc_onSelChangedLeft.sqf
Fixed: Switching between weapons with incompatible primary magazines while a compatible secondary magazine is loaded doesn't equip the new weapon's primary magazine.
* Update addons/common/functions/fnc_uniqueUnitItems.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* undefined variable
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix undefined loadout var
* Update fnc_fillLoadoutsList.sqf
---------
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-21 21:25:25 +03:00
BrettMayson
12bb5aced4
Tools - HEMTT preprocess is now an object ( #9275 )
...
* hemtt: preprocess is now an object
* error on deprecated usage
2023-07-21 11:23:03 -05:00
Grim
aead9a8eb4
fix nvg stat detection ( #9254 )
2023-07-16 12:45:33 -05:00
johnb432
8d107776c4
Overpressure - Fix invulnerable units taking backblast damage when firing launchers ( #9256 )
2023-07-14 22:33:54 +03:00
Grim
cdbf572462
Mk6 Mortar - Fix AI usage ( #9258 )
2023-07-13 19:54:39 +03:00
Grim
535662b883
Dragging - Add limping check to carrier and improve limping check for target unit ( #9251 )
...
* fix limping damage threshold
* add check for carrier not limping
2023-07-10 06:45:53 +03:00
Grim
8032ccacfc
Common - Add FUNC(hasZeusAccess)
( #9252 )
...
* add fnc_hasZeusAccess
* header
* Update addons/common/functions/fnc_hasZeusAccess.sqf
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-10 06:45:22 +03:00
Dystopian
1b8c56f0be
Interaction - Add actions to access and allow carrying inventory holders ( #6029 )
...
* Add interaction to inventory holders
* Add Take Weapon action
* Add Drag/Carry actions
* Fix menu position
* Add Inventory action also to unconscious
* Underwater: Fix menu position, disable gear action
* Add dead body weapons carrying with workaround
* Disable man gear action in water
* Optimize position code
* Fix macro using
* Use macro and power
* Restrict max dragged items count
* Remove superfluous condition, Add Take action to all holders
* Cleanup XEH
* Remove weapon carry-drop workaround
* code style changes
* code style changes
* brackets, isEqualTo, vehicle check
* code style changes
* brackets, isEqualTo, vehicle check
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-07-10 05:49:37 +03:00
johnb432
e181ba5aa1
Gunbag - Fix arsenal caching conflicting with CBA_fnc_setLoadout ( #9250 )
...
* Update XEH_preInit.sqf
* Update addons/gunbag/XEH_preInit.sqf
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-07-10 00:13:43 +03:00
johnb432
1aa7eb2a1a
Update fnc_codeToString.sqf ( #9249 )
2023-07-09 23:41:12 +03:00
Will
05c9e4247b
Logistics Wirecutter - Add modded class support ( #9235 )
...
* Update script_component.hpp
Change check for wire cutters for all child classes in addition to current class
* Update script_component.hpp
fix bracket
* Change isKindOf for alt syntax
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
* Update addons/logistics_wirecutter/script_component.hpp
Better performing searching for wirecutter
Co-authored-by: BrettMayson <brett@mayson.io>
* Update XEH_postInit.sqf
Index all possible wirecutters
* Update script_component.hpp
arrayIntersect with possible wirecutters
* Update XEH_postInit.sqf
Incorrect quotes
* Update CfgWeapons.hpp
Add iswirecutter to wirecutter
* Update XEH_postInit.sqf
Remove pointless parentheses
* Update addons/logistics_wirecutter/script_component.hpp
fix for incorrect arrayintersect check
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Update addons/logistics_wirecutter/XEH_postInit.sqf
Incorrect quoting
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* use configClasses and cache at preStart
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-07-09 19:37:30 +03:00
Tim Beswick
29b5eb97a9
Medical - Handle wound hashmaps deserialized as CBA_namespaces ( #9245 )
2023-07-09 17:33:51 +03:00
Grim
45af0cdca0
Medical Treatment - Remove early exit when stitching with sutures ( #9243 )
2023-07-07 08:19:45 +03:00
Grim
0e26755b88
Medical - Add arsenal category ( #9220 )
...
* add medical category to arsenal
* function header
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* move to preinit, protect list
* improve macro
* documentation
* add config property
* add CfgMagazines
* Revert "add CfgMagazines"
Arsenal doesn't support magazines in custom categories
---------
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-07-07 07:14:44 +03:00
Grim
30a0e55843
Field Rations - Add arsenal category ( #9221 )
...
* add field rations category
* improve macro
* second verse same as the first
* account for empty items
* switch to configClasses
* documentation
* add API variable
* Update docs/wiki/framework/field-rations-framework.md
2023-07-07 07:14:35 +03:00
Grim
04e41a4d5a
Repair - Make Full Repair Time dependent on vehicle damage ( #8417 )
...
* add variable full repair time
* enable compile cache
* Fix stupid
* whoops
* incremental full repair
* cleanup function header
* ignore hitpoints inFullRepairProgress
* fix getHitPointsToIgnore
* final cleanup
* don't show repair hint while doing full repair
* make this all work
* fix stupid
put this back in place
* Add setting for speedup when near repair facility/vehicle
enable compile cache
* refactor near repair facility/vehicle checks
* remove skipping hint from do_repair
better for feedback this way
* git diff stuff
* use functions directly in ACE_Repair.hpp
* add check for vehicle proximity
* add a new line
* switch to multiply by setting instead
* speed boost settings, remove exit addRepairActions
* stringtable
* remove speed boost settings
* fix things, add forceDisplayName
* name in function header
* fix TRACE
* add animation looping
* remove systemChat
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* add time coefficient setting
* move to repair category
* time coefficient max and default values
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-07-06 06:52:04 +03:00
Grim
50430e47ef
Medical - Change Epinephrine Wake Up Boost setting description ( #9240 )
...
* change stringtable
* keep old translations
2023-07-06 06:51:25 +03:00
Grim
cc1636c14f
Repair - Change Repair Threshold setting descriptions ( #9242 )
...
* change stringtable
* change setting to % slider
* keep old translations
2023-07-06 06:51:00 +03:00
Grim
c7e13ca4c7
Repair - Move to separate settings menu ( #9236 )
...
* Repair - Move from logistics settings menu
* Repair - Move from logistics settings menu
2023-07-03 16:00:46 +03:00
Grim
ba4fcf615d
Medical GUI - Add setting to show Damage ( #8444 )
...
* use pain variable for severe pain and use threshold in damage color calculation
show % of damage threshold in medical menu
* use damage taken instead of damage left
* Add setting and switch to separate tooltip
* tooltip -> entry
* Change display names and tooltip
* switch to qualitative
* remove newlines
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-07-01 01:37:08 +03:00
Dystopian
22b93e2d03
Vehicles - Add Resume/Set functionality to speed control ( #8967 )
...
* Add Resume/Set functionality to speed control
* Apply suggestions from code review
Co-authored-by: BrettMayson <brett@mayson.io>
---------
Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-28 17:17:14 +03:00
Dystopian
8b94d765aa
Dragging - Allow run when carrying light-weight objects ( #8338 )
...
* Allow run when carrying light-weight objects
* Use global var instead of macro
* Update addons/common/XEH_postInit.sqf
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-06-28 14:43:10 +03:00
PabstMirror
f812daa095
Javelin - Fix weapon being in top-attack when loading AP magazine ( #9161 )
...
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-28 12:55:45 +02:00
JonBons
055503928c
Vehicle Damage - Fix incoming damage from blank hit selection resulting in absurd damage values ( #9194 )
2023-06-28 13:39:33 +03:00
BrettMayson
10c1085aba
Repair - Add wheel patching ( #8835 )
...
* patch wheels on vehicles
* all tire patching working
Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>
* doc
* remove unused string
* Update CfgVehicles.hpp
* use strintable
* setting for where the wheel can be patched
* localize
* Update stringtable.xml
* can't patch a missing tire
* removal > replacement
* Update addons/repair/initSettings.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Apply suggestions from code review
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Apply suggestions from code review
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* patch icon
* use PATCH_WHEEL_STEP_TIME
* fix wheel translation
---------
Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-06-28 13:39:08 +03:00
pterolatypus
f434549faf
Medical Treatment - Change stitching action to be per-body-part ( #9005 )
...
* Make stitching action per-body-part
* Apply suggestions from code review
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
---------
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-28 01:43:45 +03:00
PabstMirror
4f0577ce5f
Medical Engine - Ignore Reflector Hitpoints ( #9131 )
2023-06-27 19:41:10 +03:00
pterolatypus
4a3ad40c04
Adv Fatigue - Make stamina penalty for weapon raised/ready scale with weapon inertia ( #8669 )
...
* Stamina penalty for weapon raised/ready is scaled by weapon inertia
* Newline
* Tabs
my editor hates me
* Use format
* Improved item validation and caching
2023-06-27 19:40:07 +03:00
Grim
2571550bbc
Intel Items - Change scope for better Arsenal filtering ( #9228 )
...
* scope changes
* review change
2023-06-27 10:46:56 +03:00
Cyruz
aa21ba50a9
Cookoff - Improve destroying vehicle post cookoff ( #9029 )
...
* Have vehicle explode when cookoff completes
* Adjust strings
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-25 01:06:26 -03:00
Kyle Mckay
02365609b5
Medical - Change medical to use hashmaps for wound storage ( #8926 )
...
* Refactor medical to use hashmaps for wound storage
- We most frequently want to access wounds by body part, so this makes
that a constant time lookup.
- The body part index is no longer stored in every wound since it's
inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
clarity (no more magic numbers).
closes #6468
* Add deserilization migration from old wound arrays
Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.
* fix issue with suture stitching
* change version number in comment
---------
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 08:11:56 +03:00
Crowdedlight
6181616cc3
Fire - Fix fire spread to invincible units and not being able to be put on fire by proximity if multiple units are on fire ( #8632 )
...
* fire do not propagate to close unit if allowDamage is disable don that unit
* change burnCounter so it works with multiple instances of fires
* fixed exiting burning not resetting burn counter
* changed !isEqualTo to isNotEqualTo
* changed !isEqualTo to isNotEqualTo
* lazy eval, respect old allowDamage variable
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 05:34:31 +03:00
Mathew Horner
78c1ce3ae9
Logistics Wirecutter - Check if fence model is in FENCE_P3DS
even if config check fails. ( #9201 )
...
* Check if fence model is in FENCE_P3DS even if config check fails.
* Fix early return condition
* Simplify condition
2023-06-24 05:10:04 +03:00
Wakbub
117c3092f8
Common - Fix added throwables not being throwable ( #9186 )
...
Replace
- addMagazineCargoGlobal with addItemTo(Uniform/Vest/Backpack to make added throwables throwable.
2023-06-24 05:09:30 +03:00
Filip Maciejewski
beffc7660c
Fire - Loop "Pat down" action until patient is put out of fire ( #9017 )
...
* Adjust burn intensity defines and move to shared
* Loop "Pat down" action until patient is put out of fire
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-24 05:08:23 +03:00
BaerMitUmlaut
728f556ae4
Medical AI - Use suppressed EH to determine safety of AI ( #8242 )
...
* Use suppressed EH to determine safety of AI
* Require CBA 3.15.3
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BrettMayson <brett@mayson.io>
2023-06-23 18:59:11 -03:00
Ampersand
e5654914cc
Dragging - Improve carrying by allowing carried object to be loaded into vehicle by key or mouse ( #9138 )
...
* load carried object
* check for medical loaded
* space
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* consolidate mouse hint in pfh
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-06-23 15:11:16 +03:00
Laid3acK
b75d20634b
Ballistics - Add 12.7x108mm APDS AB values ( #9191 )
...
* 127x108_apds_compat_ace3
* 127x108_apds_compat_ace3
* 127x108_apds_compat_ace3
* 127x108_apds_compat_ace3
* 127x108_apds_compat_ace3
---------
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-06-22 16:01:09 +03:00
Laid3acK
4aacbb960f
Ballistics - Improve B_127x108_Ball values ( #9192 )
...
* 127x108_compat_ace3
* 127x108_compat_ace3
* 127x108_compat_ace3
2023-06-22 04:35:44 -03:00
Kam
1e6073c467
give tourniquet to patient or medic depending on setting ( #9206 )
2023-06-22 04:26:28 -03:00
Grim
34c5988333
Frag/Medical Damage - Treat shrapnel as grenade damage ( #9218 )
...
* treat shrapnel as grenades
* switch to frag
2023-06-22 04:06:52 -03:00
Laid3acK
626d886b3b
Hearing - Remove outdated 12.7x108mm audibleFire value ( #9193 )
...
* 127x108_hearing
* 127x108_hearing
2023-06-22 04:06:07 -03:00
Grim
793ef7bba5
Dragging - Use improved loadAbs for weight calculation ( #8457 )
...
* use improved loadAbs for weight calculation
* fix double counted backpack cargo
---------
Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
2023-06-22 04:04:19 -03:00
Zachary Dunn
864d2e9eee
Explosives - Add "ace_explosives_setup" CBA Event ( #9197 )
2023-06-20 13:36:57 -06:00
Grim
49f4ea23e7
Docs - Add Grim to maintainers ( #9223 )
...
* secret handshake?
* fix my name
* new github username
2023-06-19 16:31:17 +03:00
Mike-MF
888ac6c9bc
Arsenal - Fix null comparison ( #9213 )
2023-06-10 18:59:13 +02:00
Abogado
3d3aa8d877
Update Spanish translation ( #9203 )
...
An update of the spanish to the text strings that have been added lately.
2023-05-29 18:22:37 -05:00
KJW
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater ( #9096 )
2023-05-15 23:47:00 -06:00
PabstMirror
2e54ee7bee
Explosives - Add getVar to disable setShotParents ( #9190 )
...
* Explosives - Add getVar to disable setShotParents
* Update docs/wiki/framework/explosives-framework.md
2023-05-03 11:55:02 -05:00
PabstMirror
fedefd5799
SOG Compat - Fix compatibility with grad trenches (__has_include
) ( #9189 )
2023-05-01 19:40:16 +02:00
Ellis Nielsen
cd41594a60
Towing - Add CBA event for towing start and cancel ( #9178 )
...
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-05-01 19:39:22 +02:00
jonpas
d279a8e607
Documentation - Cleanup function documentation output
2023-05-01 17:38:27 +02:00
jonpas
48a4e9682c
Forbit use of (optional) in function headers, always require a value
2023-05-01 17:33:07 +02:00
Cre8or
19e72d7b71
Explosives - Fix incorrect shotParents ( #9171 )
...
* Update fnc_setupExplosive.sqf
- Added `setShotParents` to the resulting explosive, enabling support for kill tracking
* Add setShotParents to fnc_placeExplosive
* Remove setShotParents from fnc_setupExplosive
* Move setShotParents into place event
* fix tabs
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-04-30 17:06:44 -05:00
PabstMirror
52842b6f14
Scopes - Add tool to diagnose scope height ( #9152 )
...
* Scopes - Add tool to diagnose scope height
* fix ico_01, tws_mg scopes
2023-04-30 16:57:34 -05:00
PabstMirror
79925b2f76
Interaction - Fix opening locked doors for GM buildings ( #9154 )
...
* Interaction - Fix opening locked doors for GM buildings
Fix #9143
* Update addons/interaction/functions/fnc_openDoor.sqf
2023-04-30 16:56:39 -05:00
PabstMirror
19e88aa8e7
Common - Fix script error in fnc_getVehicleCargo ( #9156 )
...
* Update fnc_getVehicleCargo.sqf
Close #9155
* change var name
Co-Authored-By: commy2 <6576312+commy2@users.noreply.github.com>
---------
Co-authored-by: commy2 <6576312+commy2@users.noreply.github.com>
2023-04-30 16:56:26 -05:00
PabstMirror
fbe23ee45f
Optionals - Load dynamically based on presence of mod (__has_include
) ( #9116 )
...
* Optionals - Load dynamically
* Update XEH_preStart.sqf
* Update pboproject.yml
* Update script_macros.hpp
* use addon.toml for hemtt
* Update pboproject.yml
* update all actions
ref
Node.js 12 actions are deprecated. Please update the following actions to use Node.js 16: actions/checkout@v2, actions/upload-artifact@v2.
* Update arma.yml
* Update arma.yml
* Update arma.yml
* Update arma.yml
* Update arma.yml
* Update arma.yml
* Apply suggestions from code review
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
* Update settings.json
* cleanup interm hemtt changes
* Update .github/workflows/arma.yml
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
---------
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-04-30 16:53:43 -05:00
jonpas
76e1aafb33
Use function documentation script ( #6897 )
...
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
PabstMirror
9e42c53196
xm157 - Fix latitude calc for maps not in getMapData
( #9188 )
2023-04-27 20:18:12 -05:00
PabstMirror
b78f8684b7
Common - switch getTurretConfigPath to use cba func ( #9180 )
2023-04-14 17:42:57 -05:00
Enrico Machado
1bf3d5086c
Fixed wrong portuguese translation of "head" ( #9183 )
...
"Caebça" is wrong, the correct would be "Cabeça"
2023-04-14 17:41:32 -05:00
BaerMitUmlaut
4aa8d59701
Use polyline marker for straight lines ( #9174 )
2023-04-03 12:18:47 -05:00
PabstMirror
f1fc0df6ef
Respawn - fix script error ( #9166 )
2023-03-20 13:18:57 -05:00
PabstMirror
bcbd762748
Fortify - Categories ( #9167 )
...
* Fortify - Categories
* Update fnc_registerObjects.sqf
* Apply suggestions from code review
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Apply suggestions from code review
* Update docs/wiki/framework/fortify-framework.md
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* Update addons/fortify/ACEX_Fortify_Presets.hpp
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
* just use flat objects array
* Update fnc_getPlaceableSet.sqf
---------
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-03-18 19:23:20 -05:00
Whigital
50100b8178
Viewdistance - Fix viewdistance from videosettings ( #9140 )
2023-03-18 14:28:27 -05:00
Cyruz
2092d4fd71
Cookoff - Remove flares from cookoff ( #9146 )
...
* Framework for removing flares
* Seperate fnc and strings etc
* Improvements from @mharis001
* Fix incorrect header fnc
* Clean-up return
* Remove setting
2023-03-18 14:24:27 -05:00
Filip Maciejewski
4997a4c102
Explosives - Fix mine defuse exclusion not workin before postInit is executed ( #9170 )
2023-03-16 08:52:29 +00:00
PabstMirror
169dbdfee0
Field Rations - Add water supply to well from Contact DLC ( #9168 )
...
* Field Rations - Add water supply to well from contact dlc
* Update addons/field_rations/CfgVehicles.hpp
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
---------
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2023-03-15 23:43:53 -05:00
Psycool
d87e16e87e
Korean Translation Improved ( #9164 )
...
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
* Korean Translation Added
Added Korean translation related to Cargo Refuel
* Merge branch 'master' of https://github.com/Psycool3695/ACE3
2023-03-10 19:17:36 -06:00
BrettMayson
e252ef67d6
Medical Treatment - Suture ( #9020 )
...
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com>
2023-03-06 14:17:01 -06:00
Zman6258
56348e70fa
Added missing vanilla casing types ( #9162 )
...
Super minor change, but I noticed not every vanilla casing had a corresponding ace3 casing defined. Most noticeable with 7.62x39, where they swap from steel to brass casings on landing.
2023-03-01 12:42:46 -06:00
Psycool
434820d8dd
Added Korean Translation ( #9160 )
...
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
* Korean Translation Added
Added Korean translation related to Cargo Refuel
2023-02-27 14:42:10 -06:00
BaerMitUmlaut
60cc8fbe88
Fix respawn when letting AI take over playable units ( #9145 )
2023-02-23 23:28:06 -06:00
PabstMirror
4de8487db0
Update fnc_makeJerryCan.sqf ( #9153 )
2023-02-17 22:19:31 -06:00
TACHarsis
1693e6834d
Added ace_rearm_sourceInitialized
event ( #9134 )
2023-02-17 20:59:23 -06:00
TACHarsis
28e8e7d4ca
Refuel - Add events for fuel source and jerry can creation ( #9133 )
...
* Refuel - Added events
* Added ´ace_refuel_fuelSourceInitialized´ and `ace_refuel_jerryCanInitalized´ events
* Updated documentation
* Cleaner implementation && more coherent with analog rearm event
* Rebase merging is weird
2023-02-17 20:49:57 -06:00
Samuel Deutsch
edf4a70ed6
Refuel - Added ability to refuel fuel sources ( #8981 )
...
* Simplify main fuel loop
* Remove unecessary action macro
* Add container refueling
* Fuel counter behaviour is now consistent for both limited and unlimited fuel sources
* Update maxFuel and refuelContainer whenever fueling begins
* Update maxFuel and refuelContainer whenever fueling begins
* Prevent loading of fuel sources into cargo when they have a nozzle connected to them
* Added action to check how much fuel is left in a jerry can
* Prevent jerry cans from being picked up if they have a nozzle connected to them
* Added function to check if a nozzle can be connected to an object
* Prevent fuel sources which have their nozzle deployed from being loaded
* Compute both tank volumes inside of refuel instead of durring turn on
* Didn't mean to delete these
* Allow for user defined fuel capacities
* Handle more edge cases with infinite fuel sources
* Refuel - Prevent fuel sources from being dragged while they're refueling other things
* Refuel - Added flow rate multiplier for refueling fuel sources
* Refuel - Use FUNC instead of DFUNC for nozzle actions
* Refuel - getCapacity should return REFUEL_DISABLED_FUEL instead of 0 when argument is not a fuel source
* Refuel - Correctly reset fuel counter when fueling a new target
* Refuel - Implemented all suggested changes
* Refuel - Added newlines to end of files
* Refuel - Added missing newline at end of XEH_PREP
* Only setFuel once per jerry can creation
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Calling getFuel will initialize the fuel source
* Refuel - Add newline to end of file
---------
Co-authored-by: BaerMitUmlaut <baermitumlaut@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-16 20:06:11 -06:00
mharis001
67ebb15e07
Dragging - Improve weapon reselect behaviour ( #9052 )
...
* Dragging - Improve weapon reselect behaviour
* Add and use func to getFiremodeIndex
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-13 22:01:51 -06:00
JonBons
86d79b2fc1
Common - Fixed CBA keybinds not working with progress bar ( #9139 )
...
* Fixed CBA keybinds not working on the progress bar after cursor hiding change
* Removed fallback value for uiNamespace lookup
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
---------
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2023-02-13 21:57:32 -06:00
PabstMirror
06ae622dda
Weapon Select - Remove vehicle smoke selection key ( #9144 )
2023-02-09 13:17:24 -06:00
PabstMirror
cac223c6ec
Common - Use hashmap variable for canDig surfaces ( #9147 )
...
* Common - Use hashmap variable for canDig surfaces
* Update XEH_preInit.sqf
* Update fnc_canDig.sqf
* Update fnc_canDig.sqf
2023-02-09 13:16:42 -06:00
Psycool
f67957cdde
Translations: Korean ( #9142 )
...
* KoreanTranslation
Someone has returned all the translations in Korean to English. there is no need to return them.
* koreantranslation
* Korean Typo Fix
* Korean Translation
* Update stringtable.xml
2023-02-03 16:26:15 -06:00
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility ( #9105 )
...
* HEMTT v10 Compatibility
* Update addons/field_rations/CfgUIGrids.hpp
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* fix PabstMirror review
* optionals
* End empty macro definitions with semi-colon (HEMTT v0.10)
* Adapt to HEMTT v0.10.0-a14
* Revert End empty macro definitions with semi-colon
* Disable old HEMTT build step in CI
* Add missing include and fix macro usage and include casings
* End empty macro definitions with semi-colon (HEMTT v0.10)
* Update addons/disarming/functions/fnc_showItemsInListbox.sqf
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* cleanup test code
* arty - keep style same as before
* fix fire screams
* Update script_component.hpp
* Keep old hemtt/workflow/sqfc
* Update arma.yml
* Update arma.yml
* Update CfgUIGrids.hpp
---------
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-02-01 23:28:55 -06:00
BrettMayson
f83a2df4b5
Medical Blood - Add source of blooddrop to events ( #9102 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-02-01 05:03:44 -06:00
mharis001
b4005bca43
Common - Fix disableUserInput blocking respawn ( #9053 )
2023-01-31 17:14:50 -06:00
letus
8d2d49202d
Quickmount - Fix teleport bug in UAV through change seat ( #9065 )
...
* fix bug with changeseat in uavs
* isnull to isNull
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
---------
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2023-01-31 17:12:19 -06:00
PabstMirror
952375c676
Tools - Add dummy rtms to make ace buildable by current mikro tools ( #9135 )
2023-01-28 14:13:45 -06:00
JonBons
6b3aa3e0a2
Common - Hide cursor during progress bar ( #9128 )
...
* Common - Hide cursor during progress bar (w/ CBA setting)
* Fix base class define
* Removed CBA setting for disabling hiding of the cursor for the ACE progress bar
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-01-24 13:57:10 -06:00