Commit Graph

14750 Commits

Author SHA1 Message Date
BrettMayson
3882367060
Arsenal - Show attached objects in arsenal mission (#9036) 2022-09-22 13:10:28 -05:00
Nikita S
9dd0472b57
Added ACE Hearing Protection to 6M2 and helmets with 6M2 (#9039) 2022-09-22 13:09:32 -05:00
zharf
5587d9dc69
Arsenal - Fixed fetching loadout from extended loadout (#9045) 2022-09-22 13:06:00 -05:00
PabstMirror
22586fc137 Prep 3.15.1 2022-09-12 16:43:22 -05:00
Whigital
081e9f15a3
RHSAFRF Compat - Fix subsonic ammo ballistic attributes (#8990) 2022-09-10 13:03:02 -05:00
Whigital
b9ce02acf9
Explosives - Fix cellphone ringing if RF blocking present (#8991) 2022-09-10 13:02:53 -05:00
PabstMirror
accba4dd34
Update hunterkiller-framework.md (#9026) 2022-09-08 21:20:11 +02:00
ace3mod
abd3e383fb [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-09-08 14:42:25 +02:00
Filip Maciejewski
10881fc5bd
SOG Compat - Add 1.2 update support (#8974)
* Update vn_mine_tripwire_m16_02_ammo base class

* Fix fnc_handlePunjiTrapDamage

Hopefully once and for all

* Remove placement actions from punji traps

* Add Explosives compat for 1.2 content

TODO testing

* Add quoting to stringtable config usage

* Prevent bike mine placement object from swinging all over the place

* Add non attachable ACE_Triggers for big mines

Bike mine looks kinda stupid when it's attached to a car...

* Bike mine triggers

* Cartridge mine triggers

* Lighter mine triggers

* Pot mine triggers

* Jerrycan mine triggers

* Mortar shell mine triggers

* Grenade board mine triggers

* Inheritance fixes

* Update damage handler for new punji traps

* Improve interaction points and dig distances

* Dh10 mine triggers

* Bump damage of vn_mine_cartridge_ammo

* Add incendiary features to lighter and jerry can explosives

WIP

* SOG Compat - Added fuel tank volumes for SOG update 1.2 vehicles (#8978)

* Added fuel tank volumes for SOG update 1.2 vehicles

* Type 55A is similar in fuel capacity to the PTF Nasty, not the PBR

* Add missing EOLs

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Improve placement feedback of Whip punji

* Add inheritance to custom wound handlers

* Fix doorway punji position

* Add spikes offset for affected units of doorway trap

* Prevent spiderholes from being loaded into cargo

* Add missing continue digging action to spiderholes

* Fix spiderholes physics while being dug up via trenches system

Depends on #8998

* Add missing params

* Fix parenthesis

* Add pDrive dummy files

This is stupid.

* Enable Melee weapons in the arsenal

* Add Entrenching tool capabilities to Shovel and ETool

Depends on #8999

* Add incendiary features to Molotov and M14

* Tweak chance of being set ablaze

Now sums all hitpoints damage.

* Add ACE_damageType to napalm and he bombs

* Do not change cartridge mine damage and range if no ACE Medical

* Simplify variable config values

* Swap cartridge mine hit values

Whoopsie.

* Add overpressure configs to launchers

* Fixed an issue preventing the M1919A6 CSW from being disassembled (#8970)

* Remove disassembleTo from CSW weapons

This config property is meant for tripods.

* Add CSW config for MG42

* Simplify requiredAddons

* Remove proxy weapons from most of the CSW, adjust loading times

The animations are pretty important in case of SOGPF turrets, the ammo load times were adjusted accordingly so the total loading times is similar.

* Add vn_pavn_30_can.p3d pDrive dummy

* Fix missing MG42 mag icon

* Add field_rations values to food props/mags

Needs #9008 to be usable.

* Add more field_rations values to food props/mags

Send help.

* More food configs

* Even more food configs

Fooooood.

* More fooood

Even more foooooood.

* Fix food inheritance

* Add SGM CSW compatibility

* Various fixes for CSW

Wrong tripods for opfor guns, missing translation

* Improve TOW interaction position

* Add dragging and interaction configs to recoilles rifles

* Cleanup SGM CSW config

* Add MK18 CSW config

* Add H-12 MLRS CSW config

* Add missing Mk18 stringtable

* Add function header and logging to fnc_woundsHandlerIncendiary

* Add missing weapons in CfgPatches array

* Add entrenching tool config to backpacks

* Fix Hammer and Fire axe melee weapons

* Add missing CSW images

Thanks @BaerMitUmlaut

Co-authored-by: Samuel Deutsch <Quantx@users.noreply.github.com>
2022-09-08 14:41:52 +02:00
Zman6258
5b06a1f882
Docs/Cargo - Include missing "unload type" param (#9010)
* Docs/Cargo - Include missing "unload type" param

There's a LOT of pages that are still missing documentation on listenable events entirely, maybe I'll get around to fixing that at some point.

* Update events-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-09-06 15:20:44 -05:00
Vdauphin
8a949d4f24
ace_tagCreated EH not fire x (#9025) 2022-09-06 14:37:24 -05:00
Filip Maciejewski
f734fa9e86
Field Rations - Basic CfgMagazines support (#9008)
* Add basic CfgMagazines support for field_rations

* Update headers

* Fix CBA context menu

* Add backward compatiblity to fnc_consumeItem

* Fix item refill not finishing

Whoopsie.

* Revert "Add backward compatiblity to fnc_consumeItem"

In hindsight it's not necessary, this is not public function.
2022-09-06 13:21:45 +02:00
Filip Maciejewski
508e669e05
Trenches - Add modded Entrenching Tools support (#8999)
* Add support for other entrenching tools

* Docs

* Remove unused variable

* Check unit weapons for entrenching tool

`weapons` returns weapons in weapon slots and from all containers.

* Update addons/trenches/README.md

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Support for shovel Backpacks

* Update XEH_preStart.sqf

* Add Arsenal "Entrenching Tool" stat

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-09-05 00:21:29 +02:00
Mike-MF
b97056f527
Add Budget update to wiki (#9024) 2022-09-04 16:38:53 -05:00
PabstMirror
a339074659
Tagging - Allow tagging vehicles (overwrite "clan" tag) (#8852)
* Tagging - Allow tagging vehicles (overwrite "clan" tag, req 2.10)

* Update addons/tagging/functions/fnc_createTag.sqf

Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>

* fix var

* set REQUIRED_VERSION to 2.10

* don't tag if veh has no valid selectionClan

Co-authored-by: Neil Evers <neil.evers.1995@gmail.com>
2022-09-04 16:38:09 -05:00
Whigital
66801bb0ed
Goggles - Fix APR and Regulator overlays being flipped (#9009) 2022-09-04 16:37:48 -05:00
PabstMirror
dc3f6c6634
RHS Compats - Minor cleanup (#9022) 2022-09-03 12:49:39 +02:00
PabstMirror
44ac76f2cf
xm157 - fix ab func (#9021) 2022-09-03 12:49:07 +02:00
Filip Maciejewski
3872eb0647
Add a way to block auto carry after unload on classes (#9013) 2022-09-01 14:06:24 -05:00
ace3mod
c633a199b4 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-09-01 20:45:00 +02:00
PabstMirror
cc3bad3c56
XM157 (NGSW-FC Smart Scope) Framework (#8897)
* XM157 (NGSW-FC Smart Scope)

* Update addons/common/functions/fnc_rscObjectHelper.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Update addons/xm157/functions/fnc_weaponInfo_draw.sqf

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* Headers

* Handle prone-deploy weapon bank

* Disable Reticle picker for now

* some localizations

* Change font

looks like CUP modifies EtelkaMonospaceProBold for some reason??

* Create xm157-framework.md

* Formating

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
2022-09-01 13:44:19 -05:00
ace3mod
77cf716e8b [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-09-01 20:38:57 +02:00
PabstMirror
981a8ea352
Hunter Killer (Commander Override) (#8496)
* Hunter Killer (Commander Override) - Initial Demo

* Just do a one-time slew

* Update fnc_eachFrame.sqf

* Update addons/hunterkiller/functions/script_component.hpp

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

* Update for ArmA 2.08

* cleanup

* Rework Observe / Control configs

* Add to all 2035 tanks

* Update script_component.hpp

* Use eyeDirection on commander turrets

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>

* Add to all 2035, support ture/false setVars

* remove from apcs because mods don't know how to do inheritance

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2022-09-01 13:38:22 -05:00
ace3mod
6556a256a9 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-09-01 19:45:16 +02:00
Filip Maciejewski
a6ced105ee
Add No vehicle clan logo component (#9018)
* Add novehicleclanlogo component

* Documentation

* Update README.md

* Use selection name from vehicle config
2022-09-01 12:44:38 -05:00
ace3mod
8c249a12e8 [Docs] Update component dependencies
Automatically committed through CI.

[ci skip]
2022-08-31 06:18:11 +02:00
Timi007
11984f6dcb
Marker Flags - Add placing system & icons (#8951) 2022-08-30 22:17:31 -06:00
PabstMirror
4eef2da0fe
Missile Guidance - Use weaponsInfo to optimize fire-mode selection (#8879) 2022-08-29 09:33:58 +01:00
Filip Maciejewski
78f0262e10
Fire - Increase effectiveness of rolling for putting out fire (#9016)
* Increase effectiveness of rolling for putting out fire

* Use same value for rolling and pat down
2022-08-29 02:27:10 +02:00
Dystopian
20fb895b31
Towing - Add rope to vehicle inventory (#8963)
* Add rope to vehicle inventory

* Use LINKFUNC

* Make setting not need restart

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-29 02:24:24 +02:00
RcINS
e677021e5a
Translation - Improve ace_rangecard translation (#9012)
* Complete Simplified Chinese translation

* Slight tweak translation

* Fix rangecard Chinese translation
2022-08-28 18:10:21 -05:00
Filip Maciejewski
ecb7721c77
Medical - Disable blood spurts for fire, burn and drown damage types (#9001) 2022-08-25 12:05:50 -05:00
BrettMayson
438a90b63d
Common - Add CBA extended loadout (#8923)
* extended loadouts - earplugs, gunbag, and arsenal identity

* arsenal - maintain default loadout size check

* restore comment

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

* fix forgotten example

Co-authored-by: jonpas <jonpas33@gmail.com>
2022-08-25 11:56:54 -05:00
JonBons
8e06f2ec6b
Cookoff - Tweaked effects cleanup to add Deleted EH globally and trigger a local cleanup event (#9000) 2022-08-20 16:38:06 -05:00
JonBons
f846b9ab82
Cookoff - Randomized the delay from start of cookoff and ammunition detonation (#9002)
* Cookoff - Added a random delay between a vehicle being killed and when the ammo starts to cookoff

* Cookoff - Tweaked min ammo start delay to 1 second

* minor syntax and macro cleanup
2022-08-20 16:36:37 -05:00
Tim Beswick
2a4355dfb9
Cargo - Add setting for carry after cargo unload (#8997)
* Add setting for carry after cargo unload

* Fix typos

* Contributors

* Don't make setting global

* Update addons/cargo/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2022-08-20 16:28:16 -05:00
Whigital
b2b3149d1d
RHSUSF Compat - Fix A-10A 30mm 5:1 DU:HEI mag rearm (#8972) 2022-08-20 16:18:01 -05:00
Filip Maciejewski
a421a63eea
Trenches - Add "placed" and "finished" events (#8998)
* Add trench placed and finished global events

* Docs
2022-08-20 15:43:50 -05:00
Ozan Eğitmen
f3c66e83b4
Refuel - Add Progress Bar Duration Setting (#8971)
* Refuel: Allow changing progress bars' duration

* Clarify Turkish progressDuration_DisplayName

* Update addons/refuel/functions/fnc_moduleRefuelSettings.sqf

* Change progressDuration setting's type to TIME

* Update progressDuration setting display name, add description too

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-08-17 13:25:37 +02:00
Björn Dahlgren
a76f8924d8
CI - Use pull request branch pDummies during build (#9003) 2022-08-17 13:01:08 +02:00
Samuel Deutsch
7a64ccb7a5
Refuel - Improved fuel hose texture (#8983)
* Added custom fuel hose

* Fixed indentation

* Added model config for hose

* Added model config for hose
2022-08-17 13:00:54 +02:00
Whigital
286537cd54
Fortify - Fix funds being lost when canceling deploy (#8992) 2022-08-17 12:59:07 +02:00
Kam
131b0b9472
Captives - Load into back seats first (#8973)
Reverses the list of seats for loading captives
2022-08-16 15:33:15 +01:00
GhostIsSpooky
4943b2119d
CSW - Fix loading with ammo from vehicle cargo (#8995)
Co-authored-by: GhostIsSpooky <LinkIsParking@hotmail.com>
2022-08-14 17:09:01 +01:00
Cyruz
b47b8014e7
Fix incorrect mempoint for sound src (#8989) 2022-08-09 09:38:06 -05:00
ACCtomeek
0c90f8a609
Update AUTHORS.txt (#8996) 2022-08-08 17:24:01 +01:00
Whigital
fc17697ef7
Overpressure - Fix backblast originating at projectile (#8985)
* Overpressure - Fix backblast originating at the projectile

* RHSUSF - Improve backblast for shoulder launchers

* RHSAFRF - Improve backblast for shoulder launchers

* RHSGREF - Improve backblast for shoulder launchers

* RHSSAF - Improve backblast for shoulder launchers

* Overpressure - Simplify projectile offset and cache lookups

* Overpressure - Remove parentheses and use array as hash key

* Overpressure - Rename caching function and move lookup
2022-08-01 18:32:02 +01:00
Whigital
cd9372a8e1
RHSSAF Compat - Disable vanilla use action on explosives (#8982) 2022-07-30 18:09:02 -05:00
RcINS
904310c99a
Translation - Add Simplified Chinese translation (#8984)
* Complete Simplified Chinese translation

* Slight tweak translation
2022-07-30 18:08:44 -05:00
ZluskeN
df3a9de7cd
Advanced Vehicle Damage disabled by default. (#8925)
Maintainers [...] want Advanced Vehicle Damage disabled by default.
https://github.com/acemod/ACE3/pull/8734#discussion_r787918244
2022-07-23 19:59:21 +02:00