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,389 Commits 73 Branches 88 Tags 752 MiB
422c47aae6
Commit Graph

14389 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mjc4wilton
422c47aae6
Fortify - Add Progress Bar (#8585) 
* Fortify - Add Progress Bar

* Misc Fixes

* Add animation loop

* Adjust default values to make larger objects take longer to build

* Fix merge conflict additional

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-11-08 12:01:39 -06:00
Crowdedlight
62ed899ecc
Fire - Adding option to disable screaming for units on fire (#8665) 2021-11-08 00:32:49 +01:00
Vdauphin
c83caa63b4
Explosives - Fix objNull reported as source and instigator in BI handleDamage event for explosive triggered by timer (#8647) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-08 00:29:27 +01:00
jonpas
715da4d1bd
Fortify - Add map area markers for Fortify objects (#8525) 
Co-authored-by: Seb <65898127+Seb105@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-08 00:21:36 +01:00
GhostIsSpooky
76524f7c26
Frag - Fix fuse-arming distance calculation (#8628) 2021-11-08 00:20:57 +01:00
Brandon Danyluk
fc6b1b7fa1
Towing - Add conditions to cancel towing in exceptional scenarios (#8612) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2021-11-08 00:19:13 +01:00
Whigital
2441ef493e
Medical Engine - Fix unconscious animation state checks (#8623) 2021-11-08 00:15:52 +01:00
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
ace3mod
62a91f8ebb [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2021-11-07 00:01:22 +01: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
9ebe427f23
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:37:27 -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
BaerMitUmlaut
6d223d9d96
Replace CPP highlighting with SQF highlighting (#8656) 2021-10-31 14:48:47 -05:00
BaerMitUmlaut
b8223a6143
Fix ACE 3 -> ACE3 spelling (#8658) 2021-10-31 14:48:17 -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
Thomas Kooi
cbe0ea2772
fix missing return in d2d_display init_input (#8596) 2021-10-27 17:25:13 -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
PabstMirror
dfe346260c
Tools - Update sqf_linter.py to ignore parse/macro errors (#8566) 
* Tools - Update sqf_linter.py to ignore parse/macro errors

* Apply suggestions from code review

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

* Update sqf_linter.py

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-26 18:44:42 -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
Dedmen Miller
b36dac75bf
RHS USAF Compat - Add RHS Jerrycan as usable Jerrycan (#8603) 
* Add RHS Jerrycan as usable Jarrycan

* Make RHS Jerrycan cargo loadable

* Support both jerrycan camo's

* Add missing canLoad property

* Update optionals/compat_rhs_usf3/CfgVehicles.hpp

Co-authored-by: jonpas <jonpas33@gmail.com>
 2021-10-25 18:18:40 -05:00
Jo David
086ba5da87
Documentation - Fix various lighthouse issues (#8600) 
* fix various lighthouse issues

* remove bom FROM AN AUTOGENERATED FILE
 2021-10-25 04:26:31 +02: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
ZluskeN
909a38bc59
SOG Compat - Barrel swapping for M60, PK and M63A (#8582) 2021-10-24 12:59:41 -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
Jo David
26fb9c61c9
Documentation - Replace all images by webp equivalents (#8594) 
* use webp

* search&replace fixes
 2021-10-24 05:10:30 +02:00
Jo David
2375529321
use the same code highlighting blocks everywhere (#8591) 
`cpp` instead of `c++` or `js`
 2021-10-23 18:39:02 +02:00
Jo David
6abc4af3f6
Documentation - Update installation manual (#8589) 
* update installation manual

* fix numbers
 2021-10-23 08:15:04 +02:00
Jo David
c9e18a76e1
sorry flummi (#8590) 2021-10-23 07:56:57 +02:00
jonpas
f97359cf5f
GM Compat - Credit and cleanup (#8579) 2021-10-22 21:02:05 +02:00