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,382 Commits 73 Branches 88 Tags 752 MiB
9be0b8b6c6
Commit Graph

11748 Commits

Author SHA1 Message Date
BaerMitUmlaut
9be0b8b6c6
Zeus - Add module for burning units (#8624) 
* Add Zeus module for burning units

* Add ACE_Curator

* Simplified module code

* Remove double module declaration

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-11-07 10:52:47 -06:00
PabstMirror
e6c6613b2a
Killtracker - Remove medical from required addons (#8668) 2021-11-06 18:00:45 -05:00
PabstMirror
9689fd00f4
Logistics Rope - Use generic model instead of one linked to DLC (#8666) 2021-11-06 13:05:03 -05:00
Brett
3c1c081239
Grenades - Flashbang reaction fixes (#8485) 
* flashbang reaction debounce

* fix skill reduction

* store flash strength

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

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

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

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

* Update addons/grenades/functions/fnc_flashbangExplosionEH.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-05 13:01:01 -05:00
Crowdedlight
5bf4167d3e
Medical - Add check to FullHealLocal in case unit is burning then extinguish before healing (#8622) 
* added check if burning in fullheal and then extinguish

* Add check if fire module is loaded as PabstMirror showed

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-04 16:36:53 -05:00
ZluskeN
43fccfd2fd
Cyrus magazine incorrectly configured as a belt (#8652) 2021-11-02 22:10:33 -05:00
GhostIsSpooky
8372f69f4e
reenable user input on featurecam (#8653) 2021-11-02 15:24:40 -05:00
PabstMirror
9c946727cc
General - Setting category cleanup (#8640) 
* General - Setting category cleanup

- Localize ACE Uncategorized
- Add subcategories for everything in Uncategorized
- Put colors in subCategory (alphabetically last)
- Add extra info on ViewDistance settings descriptions
- Move all settings to initSettings.sqf

* Update initSettings.sqf
 2021-10-30 16:42:47 -05:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
Filip Maciejewski
58f43288ab
Cookoff - Fix enable setting (#8649) 2021-10-29 17:20:02 -05:00
PabstMirror
0ddb7185c0
Field Rations - Fix GUI Layout not using XGVAR (#8646) 
Fix #8644
 2021-10-28 16:24:45 -05:00
PabstMirror
06336b8dcf
Overpressure - fix default setting for distanceCoefficient (#8634) 2021-10-28 14:17:19 -05:00
PabstMirror
c09de9a8c0
Interaction Menu - Fix house actions icon (#8641) 2021-10-28 14:17:08 -05:00
Dedmen Miller
87cfd9632e
Vehicles - Stop calling setCruiseControl every frame (#8643) 
* Speedlimit - Stop calling setCruiseControl every frame

* Added TRACE logging for cruiseControl changes
 2021-10-28 16:03:09 +02:00
Nilia119
d86ddb41d6
Translations - Add Missing German (#8592) 
* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Added German Translation

Added German Translation

* Update addons/arsenal/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ballistics/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ballistics/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cargo/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cargo/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update stringtable.xml

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/ui/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehicle_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehicle_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/vehiclelock/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/common/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cookoff/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/cookoff/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/fire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/field_rations/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/fortify/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gforces/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/grenades/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gunbag/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/hellfire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/hellfire/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/interact_menu/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/interaction/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/magazinerepack/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/map_gestures/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/markers/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_damage/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_feedback/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update addons/medical/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Apply suggestions from code review

Co-authored-by: Jo David <github@jonathandavid.de>

* Update stringtable.xml

* Update addons/explosives/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/gforces/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

* Update addons/medical_engine/stringtable.xml

Co-authored-by: Jo David <github@jonathandavid.de>

Co-authored-by: Jo David <github@jonathandavid.de>
 2021-10-28 00:10:19 -05:00
Brandon Danyluk
e7d08788c0
readd settings to enable for player vehicles (#8611) 2021-10-27 13:05:55 -05:00
PabstMirror
afca8ec830
Advanced Ballistics - Fix _maxRange in handleFired (#8552) 
* AdvBallistics - Fix _maxRange in `handleFired`

* Adding 30% more to range just to be safe
 2021-10-26 19:17:22 -05:00
Zman6258
48005f08ef
Vehicle Damage - Use "objectCurators" (#8587) 
* Vehicle Damage - Use "objectCurators"

Micro-optimization. Approximately 4x faster compared to previous method (0.0063 vs 0.0012 ms).

* Remove extra whitespace

* Removed extraneous isNotEqualTo check

* Corrected missing array

* Update addons/vehicle_damage/XEH_postInit.sqf

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-26 18:09:04 -05:00
Dedmen Miller
7b32edff09
Add PlasticCase OpenBox interaction (#8605) 2021-10-26 18:06:04 -05:00
mharis001
ff3e0a48df
Arsenal - Fix stats not updating for custom buttons (#8586) 2021-10-26 18:05:49 -05:00
Filip Maciejewski
08dff76593
Fire - Add drop weapon setting (#8578) 
* Fix casing of stringtable keys

* Use CBA_fnc_addSetting

* Move burn reactions to function, add setting for weapon throwing

* Fix stringtable keys in settings

* Use stringtable entries from common component

* Update addons/fire/stringtable.xml

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

* Update addons/fire/stringtable.xml

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
 2021-10-26 14:09:45 +02:00
PabstMirror
5468f180f0
Cargo - Add config value to block renaming (#8610) 2021-10-25 18:27:56 -05:00
Dedmen Miller
2ff27d86fb
Cargo/Dragging - Add Flexible Fuel Tanks cargo/dragging (#8604) 
* Add flexible fueltanks cargo/dragging

* Use proper macros in cargo

* Enable carrying
 2021-10-25 18:26:58 -05:00
Brett
a801d0d3c6
Cargo - Add name to bodybags (#8297) 
* cargo: labels

* Update XEH_postInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-24 13:01:21 -05:00
Laid3acK
6c2d7d1888
ACE_762x51_Ball_Subsonic (#8538) 2021-10-24 12:46:17 -05:00
Filip Maciejewski
f1837522e5
Overheating - Fix animation glitches on empty mag (#8607) 2021-10-24 12:40:11 -05:00
Filip Maciejewski
0239d97cea
Restore old default values for ACE(X) Volume settings (#8608) 2021-10-24 12:25:57 -05:00
Krzyciu
05c16b3250
Translations - Add Polish (#8597) 
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2021-10-24 19:22:27 +02:00
PabstMirror
31f70d1f0b
Volume - Move keybind to ace common category (#8601) 2021-10-24 19:20:14 +02:00
PabstMirror
3c5d47e83d
Weather - Use apparent temp in displayAirTemp (#8544) 2021-10-22 15:21:22 +02:00
Vdauphin
275a822f78
Headless - Fix no rebalance of units spawned after headless joined (#8573) 2021-10-22 15:17:58 +02:00
jonpas
b7f9aee2d7
Sitting - Fix ACEX Merge (#8577) 2021-10-22 15:16:42 +02:00
PabstMirror
285c44bf15
Killtracker - Add ability to sync globally (#8521) 2021-10-21 12:42:34 -05:00
PabstMirror
ca09b88869 Prep 3.14.0 Build 63 2021-10-21 10:58:49 -05:00
PabstMirror
8cf1d7cb1b Merge branch 'master' into release-3.14.0 2021-10-21 10:58:41 -05:00
PabstMirror
62055d2605
ACEX - change module's category to ace from acex (#8567) 2021-10-20 16:29:43 -05:00
Beeperz
c00c6b826c
Added some russian translations (#8565) 
* Added some russian translations

* replace tabs

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-10-20 13:34:43 -05:00
Elgin675
958a0bf9ec
Translations - Update French Translations (#8562) 
* Add french translation of EnableSpeedIndicator keys

* Add french translation of EpilepsyFriendlyMode keys

* Add french translation (SpecterOS, SpecterOS 7.62, Burris XTR II, EOTech XPS3)

* Add french translation of the cargo renaming fonctionality (added in PR8023)

* Fix typo in 127x99_API_Mag_NameShort translations

* Add french translation of `LocationsBoostTraining_Description` key

* Add french translation of `interactWithTerrainObjects_Description` key

* Add french translation of `repackLoadedMagazines` keys

* Add french translation of `Rename group` self-interact fonctionality (added in PR8346)

* Add french translation of `Medical_Feedback_EnableHUDIndicators` keys

* Add french translation of Vehicle Towing fonctionality (Added in PR8380)

* Fix English and Japanese translation of length rope (18.3, 27.4 and 36.6 meters)

* Add french translation of customize Medical GUI colors settings (added in PR8350)

* Add french translation for additional progress bar information feature (added in PR8428)

* Add french translation in multiple modules.

* Fix French translation of `STR_ACE_Overheating_cookoffCoef_description` key.
 2021-10-19 15:30:46 -05:00
PabstMirror
8cdf0b2c68
Revert "Common - Fix calling getVar on null object in canInteractWith (#8532)" (#8564) 
This reverts commit a0e9f6015b.
 2021-10-19 13:17:59 -05:00
PabstMirror
f818261052
acex - fix useage of old ACECSTRING macro for authors (#8561) 2021-10-18 22:50:16 -05:00
PabstMirror
7fa4d631df Prep 3.14.0 Build 61 2021-10-18 19:18:41 -05:00
PabstMirror
b49d5db7b6 Merge branch 'master' into release-3.14.0 2021-10-18 19:17:49 -05:00
mharis001
ddbfc3090c
Overheating - Fix invalid jamTypesAllowed arrays (#8560) 2021-10-18 19:05:40 -05:00
Björn Dahlgren
b12af1e0b5
General - Format config classes with consistent spacing (#8550) 2021-10-18 11:56:43 -05:00
jonpas
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
jonpas
73be44fbbf
Fortify - Use ACEX-prefixed event names (#8553) 2021-10-18 11:54:10 -05:00
PabstMirror
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
jonpas
729b7b706c
ACEX Merge - Use BWC_CONFIG macro (#8554) 2021-10-18 11:42:17 -05:00
TyroneMF
9f07a9a07b
Fix Global / Default settings (#8551) 2021-10-18 00:30:39 -05:00
PabstMirror
f2b3fe3012
Tweak Field_rations/overheating merge (#8548) 2021-10-17 21:45:01 -05:00