Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,913 Commits 73 Branches 88 Tags 752 MiB
66deb59037
Commit Graph

14913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-09-12 20:58:10 +02:00
PabstMirror
a34d9455d2
Tools - Update setup.py for hemmt dev filepatching (#9231) 
* Update setup.py

* Update setup.py
 2023-09-12 13:47:21 -05:00
jonpas
7cbdb7f410
General - Use subcomponent macro (CBA 3.16.0) (#9375) 2023-09-12 20:40:38 +02:00
PabstMirror
ebef82d10b
Tools - Fix make.py failing when pboProject\Settings folder missing (#9393) 2023-09-12 13:04:26 -05: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
jonpas
f7e247c87e
Misc - Add more workshop logos, Update README.md (#9377) 
* Assets - Move and add more workshop logos
New workshop logos by @BaerMitUmlaut

* Use png logo in README.md
Better looking for both dark and light themes

* Update testing and building instructions in README.md
 2023-09-09 19:20:42 -05: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
81daaba3ea
Docs - Add note in documentation regarding medical internal variables (#9373) 
* add note in documentation

* Update docs/wiki/framework/medical-framework.md

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update medical-framework.md

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-09-09 00:21:00 -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
PabstMirror
be4f7147d9
Update include\script_xeh.hpp (#9370) 
Update script_xeh.hpp
 2023-09-06 23:07:45 -05: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
PabstMirror
6c674533b3
Tools - make.py will try running pboProject once if it's not in registry (#9356) 2023-08-30 19:09:46 -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
882294e9f7
Tools - make.py print tail of packing log on error (#9351) 2023-08-29 15:41:56 -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