Commit Graph

14419 Commits

Author SHA1 Message Date
Filip Maciejewski
e0df864a5d
Map Tools - Improve modded maps support (#8729) 2021-12-07 22:06:15 +01:00
TyroneMF
59fe345f60
Documentation - Add dependencies page (#8706)
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-12-02 15:40:46 +01:00
TyroneMF
2f2280494f
Slideshow - Add support for texture selections (#8702)
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-11-28 02:11:46 +01:00
PabstMirror
8cea7f4007
RHS Compats - Fix various UBCs (#8688) 2021-11-28 02:11:39 +01:00
PabstMirror
53f8577122
Tools - Increase timeout on sqfvmChecker.py (#8703) 2021-11-26 22:49:37 -06:00
PabstMirror
4cd3f9fe96
Misc - Cleanup unused namespace vars (#8704)
Co-Authored-By: Serg Vergun <1197314+severgun@users.noreply.github.com>

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
2021-11-26 10:56:41 -06:00
PabstMirror
ff9afd6893 Prep 3.14.1 Build 65 2021-11-25 12:36:05 -06:00
PabstMirror
3c54dc4983 Merge branch 'master' into release-3.14.1 2021-11-25 12:35:50 -06:00
diwako
24a28da566
fix stuck in uncon animation after CfgExtendedAnimation change (#8692) 2021-11-24 12:22:17 -06:00
Jo David
94d0466f17
GitHub - Improve PR template (#8697)
* Update PULL_REQUEST_TEMPLATE.md

* Update PULL_REQUEST_TEMPLATE.md
2021-11-23 16:02:31 +01:00
Drofseh
67cad5120e
Documentation - Improve documentation for Rearm & Vehicle Damage (#8588) 2021-11-18 20:26:31 +01:00
PabstMirror
83f8539dd4 Prep 3.14.1 Build 64 2021-11-17 16:11:26 -06:00
PabstMirror
10cc340fd0
Overheating - prep canCoolWeaponWithItem (#8684) 2021-11-15 16:58:51 -06:00
diaverso
2aacb126dc
Add Spanish translation (#8682)
* Add Spanish translation

* Update addons/fire/stringtable.xml

* Update addons/fire/stringtable.xml

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-11-15 10:02:17 -06:00
GhostIsSpooky
a9296f66d5
Medical - Update setDead to use setHitpointDamage instigator param (#8397)
* Redoing this

* Revert "Redoing this"

This reverts commit 80ff709676.

* Do this properly

* Update fnc_handleKilled.sqf

* use setDead function directly

* Handle scripted camera

* redo #8387

I'm dumb.

* try this

* if construct outside of ctrlSetEventHandler

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

* tweak disableUserInput / handleKilled

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-11-15 09:31:56 -06:00
shukari
ec2028cc8a
Documentation - Add Arsenal custom sub-item categories (#8678)
* New Info: Adding custom sub item categories

* typo fix

* Custom sub item categories

* Update arsenal.md
2021-11-15 12:18:54 +01:00
PabstMirror
4b12047a79
Interaction - Fix PlasticCase_01_base_F UBC (#8681) 2021-11-14 12:36:23 -06:00
Jo David
4a3051df54
use md extension (#8680) 2021-11-14 07:45:33 +01:00
PabstMirror
2cd935acbe
Medical Engine - Synchronize random unconscious anims (#8671)
* Medical Engine - Synchronize random unconscious anims

* Update addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf

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

* Update addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf

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

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-11-11 16:34:56 -06:00
mjc4wilton
3492fadd90
Fortify - Make Progress Bar settings Global (#8677) 2021-11-11 21:12:04 +01:00
BaerMitUmlaut
3c59523361
Documentation - Rework arsenal docs (#8650) 2021-11-11 13:12:09 +01:00
PabstMirror
986b7e3f97
Tools - Binarize configs in make.py (#8662) 2021-11-11 12:47:52 +01:00
Björn Dahlgren
6234c05645
Tools - Update Mikero to public version 2021-11-06 (#8675) 2021-11-11 12:47:18 +01:00
Filip Maciejewski
f75bfd4cef
Cookoff - Limit maximum cook intensity/duration (#8648) 2021-11-11 12:43:41 +01:00
Filip Maciejewski
604f169ba5
Repair - Support all modded toolkits (#8595) 2021-11-11 12:41:25 +01:00
Zman6258
f8e06b49a2
SOG Compat - Add isDamageAllowed check to punji damage handler (#8670)
* SOG Compat - Exclude invulnerable units from punji damage handler

Title. Previously, even units with damage disabled would still have wounds added upon triggering punji traps.

* Implement lazy select

Co-authored-by: commy2 <commy-2@gmx.de>

Co-authored-by: commy2 <commy-2@gmx.de>
2021-11-09 13:49:36 -06:00
Whigital
d73f0f3db4
Fire - Fix animals screaming like humans (#8625)
* Fire - Only human screams

* Use fnc_burnReaction for screams

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
2021-11-08 20:48:54 -06:00
Drofseh
727ac12e6c
switch from params to select for single value returns when calling getWeaponData (#8672) 2021-11-08 13:08:43 -06:00
Drofseh
99c85e3c12
Overheating - Fix issues from release (#8617)
* move overheating cookoff into separate function

* move heatCoef and require mission restart for setting change

- move heatCoef to a more sensible place
- require mission restart for heatCoef setting change (it gets cached per ammo type)

* add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission

- add exit to ammo temp loop if cookoffCoef is changed to 0 mid-mission, this prevents an issue where all weapon cookoff regardless of temp, because required temp gets multiplied by cookoffCoef which has been set to 0.

* file end new line

* update header for ace_overheating_fnc_cookoffWeapon

* use ambientTemperature as floor for weapon and ammo temp

* add coolingCoef setting

* improve feature documentation

* add fnc_cookoffWeapon to XEH_PREP

* add type of jam to ace_weaponJammed local event

- add type of jam to ace_weaponJammed local event
- fix #8637

* fix misspelling

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>

* clear all weapon heat on death

* Update addons/overheating/functions/fnc_updateTemperature.sqf

Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>

* deprecate ace_overheating_fnc_getBarrelMass, cache weapon bolt and barrel mass values

- cache closed bolt value by moving config look up to ace_overheating_fnc_getWeaponData
- cache barrel mass value by moving calculation from ace_overheating_fnc_getBarrelMass to ace_overheating_fnc_getWeaponData
- deprecate ace_overheating_fnc_getBarrelMass to be a wrapper for ace_overheating_fnc_getWeaponData that only returns barrel mass

* add public functions to get and set weapon and ammo temperature

* add `canCoolWeaponWithItem` function, workaround for #8657

* Apply suggestions from code review

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

* add coef setting for addition heat from suppressor

* Update fnc_overheat.sqf

* improve fnc_canCoolWeaponWithItem

* remove extra (

* Move canCoolWeaponWithItem action code to function

* Use hashmaps and reset on settings change

* Apply suggestions from code review

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

Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: GhostIsSpooky <69561145+Salluci@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2021-11-08 12:06:31 -06:00
mjc4wilton
5bad6899cb
Medical - Add option to prevent scripted injuries on invulnerable units (#8599)
* Medical - Add option to prevent scripted injuries on invulnerable units

* Update docs

* Change from CBA setting to optional parameter

* Update header arguments to follow coding guidelines

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

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

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

* Increase readibility

* Fix trace macro

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2021-11-08 12:03:59 -06:00
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