7fa4d631df
Prep 3.14.0 Build 61
2021-10-18 19:18:41 -05:00
b49d5db7b6
Merge branch 'master' into release-3.14.0
2021-10-18 19:17:49 -05:00
ddbfc3090c
Overheating - Fix invalid jamTypesAllowed arrays ( #8560 )
2021-10-18 19:05:40 -05:00
36b9f35ada
Sog Compat - fix csw_m1919a6 string ( #8557 )
2021-10-18 12:50:15 -05:00
b12af1e0b5
General - Format config classes with consistent spacing ( #8550 )
2021-10-18 11:56:43 -05:00
9f4dd776b8
ACEX Merge - Make ACEX-prefixed functions proxies ( #8555 )
...
* ACEX Merge - Make ACEX-prefixed functions proxies
* No call
2021-10-18 11:56:08 -05:00
73be44fbbf
Fortify - Use ACEX-prefixed event names ( #8553 )
2021-10-18 11:54:10 -05:00
38b8b5dfff
Documentation - Add notes about ACEX variables ( #8549 )
...
* Doc - add notes about acex var naming to addons
* Add Fortify events
Co-authored-by: jonpas <jonpas33@gmail.com >
2021-10-18 11:49:33 -05:00
729b7b706c
ACEX Merge - Use BWC_CONFIG macro ( #8554 )
2021-10-18 11:42:17 -05:00
9f07a9a07b
Fix Global / Default settings ( #8551 )
2021-10-18 00:30:39 -05:00
f2b3fe3012
Tweak Field_rations/overheating merge ( #8548 )
2021-10-17 21:45:01 -05:00
eadbc60314
Overheating - Fix errors, improve documentation, change AceX references for integration ( #8522 )
...
* Fix jam script error, improve documentation
* formatting
* Update docs/wiki/feature/overheating.md
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
* Update docs/wiki/feature/overheating.md
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
* fix icon filepath for AceX integration
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
* Update addons/overheating/XEH_postInit.sqf
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
* move old AceX references to macros
* small whitespace formatting
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
2021-10-17 17:00:16 -05:00
37c16afe9c
Interaction - Fix Open Door keybind ( #8547 )
...
* Interaction - Fix Open Door keybind
Reach distance calculation didn't give position to
* getPosASL is redundant
2021-10-17 16:58:35 -05:00
e1185def3b
GM Compat - Fix inheritance issues ( #8546 )
2021-10-17 22:15:27 +02:00
3daa510868
Main - Add external macros for ACEX ( #8540 )
2021-10-17 22:14:40 +02:00
525f3c5ce3
Cookoff - Fix box cookoff ( #8542 )
...
* Cookoff - fix box cookoff
* rename
2021-10-17 15:01:41 -05:00
88eb4c6cd3
Add ACE support for SOG M63A ( #8545 )
...
The ammo for M63A Belt-fed version was not classified as a Belt
2021-10-17 15:01:21 -05:00
63be48f207
Cargo - Fix undefined object name in paradrop ( #8543 )
2021-10-17 00:48:31 -05:00
77fe9ab434
UI - Fix changing UI settings ( #8541 )
2021-10-17 00:48:12 -05:00
d8ebc35359
improve lin navigation
2021-10-16 22:45:39 -06:00
e6bc44225f
R3F/RHS Compat - Add Ace vehicle damage incendiary ( #8537 )
...
* ace_vehicle_damage_incendiary
* ace_vehicle_damage_incendiary
2021-10-16 21:14:13 -05:00
e1141cdd27
Medical Feedback - Fix pain effects when set to Only high pain effect ( #8534 )
...
Close #8533
2021-10-16 21:13:40 -05:00
5fc9856b61
FIX: _target not define ( #8536 )
2021-10-16 17:17:20 -05:00
290ce934f4
reduce default incendiary value ( #8529 )
2021-10-16 17:16:35 -05:00
a0e9f6015b
Common - Fix calling getVar on null object in canInteractWith ( #8532 )
...
* Common - Fix calling getVar on null object in `canInteractWith`
* why was this added dedman?
2021-10-16 17:15:37 -05:00
2dfbaa90b0
Fix hashmap bug in laser seeker ( #8531 )
...
* fix bug in laser
* use `hashValue`
2021-10-16 13:29:57 -05:00
34c7b57532
add dev function to get ammo which has MG class data
2021-10-15 22:34:45 -06:00
10c2019818
change back
2021-10-15 22:02:39 -06:00
9a2d6313b0
make pronav use the correct units
2021-10-15 22:02:26 -06:00
17e211ed59
Merge branch 'laserRevert' into missileDynamics
2021-10-15 21:49:45 -06:00
e9912a4c33
Update of Japanese translation ( #8530 )
2021-10-15 22:48:18 -05:00
0123216803
fix bug in laser
2021-10-15 21:47:15 -06:00
120d16cd0d
small changes
2021-10-15 21:35:25 -06:00
959564023e
Merge remote-tracking branch 'ACERemote/master' into missileDynamics
...
# Conflicts:
# addons/maverick/CfgAmmo.hpp
# addons/maverick/CfgMagazines.hpp
# addons/maverick/CfgWeapons.hpp
2021-10-15 20:59:28 -06:00
d46d59695f
Various - Fix setting var name ( #8528 )
...
* Scopes - Fix var name
* fix 2.5 more settings
2021-10-15 19:08:42 -05:00
93b7722716
General - Cleanup CfgPatches unit/weapon arrays ( #8524 )
...
* General - Cleanup CfgPatches unit/weapon arrays
add test tool
fix refuel pump
fix flashlight pistol transport type
fix iDAB reammo box
* Update config.cpp
2021-10-15 13:48:33 -05:00
916346ae59
General - Format config class defines to coding guidelines (+tool) ( #8520 )
...
* General - Format config class defines to coding guidelines (+tool)
* Update tools/config_style_checker.py
Co-authored-by: jonpas <jonpas33@gmail.com >
* Update tools/config_style_checker.py
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: jonpas <jonpas33@gmail.com >
2021-10-15 13:47:05 -05:00
9395068424
General - Empty units/weapons arryas in acex cfgPatches, Add acex_main ( #8518 )
2021-10-15 12:54:12 -05:00
72b63f4394
Various - use compile_script macro for new addons ( #8516 )
2021-10-15 12:53:44 -05:00
c9aa690a4d
various - cleanup maintainers in readmes ( #8517 )
2021-10-15 12:25:42 -05:00
495a9b6fb9
Tools - Cleanup all old keys in release/optionals ( #8523 )
2021-10-15 12:22:12 -05:00
5a4451a680
Tools - Add Mikero build in GitHub Actions ( #8251 )
2021-10-15 13:40:57 +02:00
500fc9a199
Prep 3.14.0 Build 61
2021-10-14 14:27:32 -05:00
26d8b8d10a
Vehicle Damage - Cleanup strings ( #8515 )
...
* vd cleanup strings
* Update addons/vehicle_damage/initSettings.sqf
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com >
2021-10-14 12:05:16 -05:00
d43cd8a458
[Docs] Update component dependencies
...
Automatically committed through CI.
[ci skip]
2021-10-14 17:50:02 +02:00
dbb35e3d85
[Docs] Update component dependencies
...
Automatically committed through CI.
[ci skip]
2021-10-14 17:49:52 +02:00
c97f0ed09c
[Docs] Update component dependencies
...
Automatically committed through CI.
[ci skip]
2021-10-14 17:49:36 +02:00
c4156a6888
Add Vehicle Damage (ACE2 port) & Enhance Cook-Off ( #7565 )
...
* Initital port of ACE2 Vehicle Damage
* Add fire damage and burning people
* Migrate vehicle damge stuff from cookoff. Change cookoff function to enhance effect.
* Minor tweaks
* Add incendiary values to all applicable ammunition. Add engine fire/smoke if hit enough
* Handle car damage more elegantly.
* Added ability to create fire sources arbitrarily
* tweaks
* Add chance to detonate after cookoff
* disable compile cache
* Move blown-off turret config to vehicle damage. Add settings inititalized EH for initializing off settings
* tabs->spaces
* Various code improvements
* Change to count loop for deleting effects
* update addon requirements
* remove vanilla config requirements
* Add RHS compatability
* RHS compat. Various QOL fixes/changes
* Various tweaks to compats and code.
* High-Explosive damage tweak
* Change how penetration is calculated for parts
* Fix RHS compat
* Create setting for flare effect
* increase burning scream sounds
* swap out file name for snake_case
* move incendiary values out of vehicle damage. remove medical dependency
* vehicle_dammage - update all refs to snake
* sqf fixes
* fix fire string package caps
* fix pboprefix
* Default setting to on
* Add variables to enable/disable ring fire to avoid goofy looking vehicles. Enhance how particles are cleaned up. Remove advanced penetration simulation. Change how fire intensity is calculated. Add setting to "disable" vehicle after cookoff
* Fix bug where event handler wasn't giving the damage last.
* change to snake
* fix build errors
* Fix UBC
* Fix Order of Operations
* avoid O^2 events
* Make sure that no damage processing happens on dead units
* Change some if statements
* Keep track of player's death to stop various things
* add quotes to right middle wheen
* Add VD documentation
* fire docs
* Code quality fixes
* Clarify documentation
* define IDD
* switch global -> server
* Add newline between header and first code statement
* stop the dead from suffering
Its hard to tell when a unit is dead or in spectator, so check the config of the unit to determine it.
* Add settings to disable cook-off effects
* Delete effects if vehicle is deleted before cookoff occurs. Don't cookoff player ammo. Throw weapon better
* Move fire into own PR
* fix tabs and macro
* Shuffle crew indices so that a random person is first on the list to be injured each time
* fix effects not clearing
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2021-10-14 10:49:27 -05:00
caca92f71d
Add Fire component ( #8245 )
...
* merge fire
* Change required addons. Change getPos to getPosASL. Remove include
* Apply suggestions from code review
* Apply suggestions from code review
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com >
* Update addons/fire/stringtable.xml
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: Kyle Mckay <kymckay.dev@gmail.com >
2021-10-14 10:49:10 -05:00
7009404d39
Add Global Mobilization Compatibility ( #7835 )
...
* GM Compat
add GM Compat addon - it's #7835 without fastroping & refuel changes
* plus compat_gm moved into optionals
* plus a few whitespace fixes
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: Fusselwurm <fusselwurm@gmail.com >
* add ACE CSW dep (see script_component.hpp)
* warn about missiong compat_gm if GM is loaded
* move medic tents to EGVAR(medical,facilities) array thing
* add pDumbs
Co-authored-by: jonpas <jonpas33@gmail.com >
Co-authored-by: Fusselwurm <fusselwurm@gmail.com >
Co-authored-by: PabstMirror <pabstmirror@gmail.com >
2021-10-14 10:48:54 -05:00
