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,574 Commits 73 Branches 88 Tags 752 MiB
11984f6dcb
Commit Graph

14574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf (#8795) 
* configOf lookups

* forEach, missed configOf

* revert handcuff distance change

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

* optimize condition

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

* capitalization

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

* use object in getVehicleIcon

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

* add return comment

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

* remove extra brackets

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

* add missing brackets

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

* add return comment pt2

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

* revert to cursorTarget

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-08 21:41:21 -06:00
Björn Dahlgren
38a308ee24
Remove pDummies for decrypted PBOs in 2.08 patch (#8838) 2022-03-08 21:00:04 -06:00
PabstMirror
ed228c54ac
Common - Block radio status effect without blocking direct voice (ACRE) (#8659) 
* Common - Block radio status effect won't block PTT voice (ACRE)

* Update addons/common/XEH_postInit.sqf
 2022-03-08 16:40:48 -06:00
GhostIsSpooky
b800bc4ae1
Fix fire not causing burn damage (#8750) 2022-03-08 16:36:26 -06:00
Drofseh
70da38cec5
Finger - Add scaling settings (#8676) 
* Add scaling settings

- sizeCoef will scale the size directly from the setting value, default 1x is the same as the current size.
- proximityScaling will scale the size based on the distance between the observer and the pointer, 2x as large at maxRange, 0.25x at 0m distance.

* fix slider decimal value

* bug fix
 2022-03-07 12:35:49 -06:00
JonBons
8b60fae23a
Magazine Repack - Add idle animation when a player starts repacking magazines (#8825) 
* Added Gear gesture animation when a player starts repacking magazines

(previously you'd just sit there doing nothing for X seconds)

* Added Repack Animation ACE Setting for allow for disabling of idle animation during repacking

* Corrected Polish translation for setting name

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

* Corrected German translation for setting name

* Removed French translation until someone can provide one

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
 2022-03-07 12:35:26 -06:00
GhostIsSpooky
a4ae61f1fc
CSW - Add reloading from nearSupplies (#8776) 
* allow players to reload from nearSupplies

* limit reloading to friendly sides

* add handling for ai getting inside empty weapon

* configOf for lookup

* add getin handler, hammer out remaining bugs

* configOf lookup

* improve friendly/object filter

* more configOf lookups

* Capitalize settings, add ammo storage setting

* remove systemChat

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

* fix TRACE

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-07 12:29:19 -06:00
GhostIsSpooky
5a72b61a50
Interact Menu - Add blocking while editing CT_EDIT (#8796) 
* Interact Menu - Add blocking while editing CT_EDIT

* use findIf

* Use A3 defines
 2022-03-07 12:29:02 -06:00
GhostIsSpooky
9209fedcf7
Medical Statemachine - Improve edge case death handling (#8788) 
* fix #8772

* add WARNING for dead/null units

* fix macro

* improve warnings

* handle scripted death without warnings

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

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-07 12:28:51 -06:00
johnb432
90ebe08012
Arsenal tweak (#8786) 
Previously:
- When a new weapon was selected, only magazines defined in the "magazines" attribute of the old weapon's class were deleted.
- When a new weapon was selected, it would consume a magazine from the loadout.

Now:
- When a new weapon is selected, it will only remove the magazines from the previous weapon that are not compatible with the current weapon.
- When a new weapon is selected, it does not consume a magazine from the loadout.
 2022-03-07 12:26:56 -06:00
Vdauphin
282dd33d59
Nametags - Fix ACE nametag drawIcon3D parameter error when player controlled unit dies (#8764) 
* FIX: `_icon` can be `nil`

* Migrate from `if` to `switch`

* Missing ()
 2022-03-07 12:26:22 -06:00
GhostIsSpooky
3b62af6131
SOG Compat - Fix remote punji traps not causing damage (#8755) 
* Initial commit

* derp

* fix derp

* fix derp again

* don't code without coffee

* damage locality is weird, bi pls fix

* Update fnc_handlePunjiTrapTrigger.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-03-07 12:25:55 -06:00
Björn Dahlgren
b1451d75f0
GM Compat - Fix explosives not being placeable (#8739) 
* GM Compat - Fix explosives not being placeable

* Copy config properties from petn to plnp
 2022-03-07 12:24:52 -06:00
Brett
6c0bc67b37
Medical GUI - Add setting to show blood loss (#8450) 
* add setting to show bloodloss

* Update initSettings.sqf

* Update stringtable.xml

* Update initSettings.sqf

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
 2022-03-07 12:23:53 -06:00
ace3mod
bd57105075 [Docs] Update component dependencies 
Automatically committed through CI.

[ci skip]
 2022-03-06 20:34:15 +01:00
Whigital
e7a827b875
Add RHSGREF UH-1H fastroping capability (#8748) 2022-03-06 13:33:42 -06:00
Whigital
f54278c9fc
Fix RHS_UH1Y (#8742) 2022-03-06 13:33:31 -06:00
GhostIsSpooky
c815cc3345
Ballistics/Realistic Weights - Improve LMG_Mk200_F (#8811) 
* Fix barrel length

* Rename to KAC LAMG

* Fix weight

* Fix barrel length

* Rename to KAC LAMG

* Fix weight

* revert name changes
 2022-03-03 17:19:10 -06:00
PabstMirror
f74aae51e6
Docs - Update package-lock.json (#8828) 2022-02-21 12:53:55 -06:00
PabstMirror
bdeb347ea9
medical_damage - cleanup woundHandler naming (#8824) 
* medical_damage - cleanup woundHandler naming

* woundsHandlerBase
 2022-02-20 17:23:56 -06:00
PabstMirror
1659d33da7
Realistic Names - Fix UBC (#8822) 2022-02-17 18:08:06 -06:00
jonpas
dcdb241836
Documentation - Fix Medical Framework page parsing (#8823) 2022-02-17 22:07:33 +00:00
pterolatypus
73a7dbdc1e
Medical - Rework wound handling (#8278) 
- Add stackable wound handler system for easy 3rd party extensibility and overriding of default wound handler.
- Change mapping from wound type -> damage types, to damage type -> wound types. Improves the semantics and makes configuration easier to reason about.
- Allow damage types to influence wound properties (bleed, size, etc.) with configurable variance parameters.
- Allow configuration of wound type variance per damage type. Enabling more logically driven variance for sensible but still varied end results.
- Improve handling of non-selection-specific damage events. The wound handler now receives all incoming damages and may apply damage to multiple selections (previously only ever one) if the damage type is not configured to be selection specific (with new config property `selectionSpecific`).
- Add debug script for testing explosion damage events at varied ranges.
- Add custom fire wound handler.
 2022-02-17 20:03:12 +00:00
commy2
00553537dc
Fix wind above towns (#8709) 2022-02-17 11:24:28 -06:00
Brett
90d63475d5
Medical Treatment - Add preferred seats for loading patients (#8789) 
* Medical Treatment - Add preferred seats for loading patients

* load patients in reverse order

* add option for reverse fill

* Update addons/medical_treatment/functions/fnc_loadUnit.sqf

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

* Update docs/wiki/framework/medical-treatment-framework.md

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

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-02-17 11:14:39 -06:00
Mateusz Cyraniak
cae743ae31
fix: changed SOG tow_missile mass (#8820) 
Mass of CSW TOW missile was over twice the largest available backpack, making it impossible to use.
 2022-02-17 11:14:09 -06:00
GhostIsSpooky
615afee022
Arsenal - Improve addWeaponItem usage (#8813) 
* reload magazine instantly on arsenal

* remove comment in reloadlaunchers

* use addWeaponItem in selChangedRight
 2022-02-17 11:14:01 -06:00
GhostIsSpooky
8cf900a1bc
RHS Compat - Improve AK104/5 barrel length (#8810) 2022-02-15 16:08:29 -06:00
RcINS
7197be2f49
Localization - Improve Simplified Chinese (#8781) 
* Improve Chinese translation

* Optional Compat SOG and Tracers Simplified Chinese

* Fix settings string not correctly localized

* Fix mode of heli minigun have no realistic name

* Fix Regex replace flaw

* fix merge

* Various improvements

* Translate CSW, fix short name not short

* Trim

* Magazines naming

* Minor tweak

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-02-14 15:57:50 -06:00
Mateusz Cyraniak
a43af828b4
SOG Compat - Fix M1919 ammo not showing in arsenal (#8815) 
vn_m1919_v_250_mag magazine has scopeArsenal attribute set to 0 so compat needs to address it.
 2022-02-08 18:05:58 -06:00
GhostIsSpooky
f7f497f0ac
Medical Status - Add isDamageAllowed check to setDead (#8803) 
* add delay & logs

* add remote support

* isDamageAllowed check

* add internal comment to setDead event

* remove remote setDead EH

* remove unnecessary changes

* Add comments and move check below the event
 2022-02-06 17:36:28 +01:00
GhostIsSpooky
70d637bcb6
fix stringtables (#8809) 2022-02-03 17:19:11 -06:00
Filip Maciejewski
df40f63b5f
Cookoff - Fix invalid function name in example (#8808) 2022-02-01 13:54:01 -06:00
GhostIsSpooky
5b89daf277
fix CPR treatment condition (#8762) 2022-01-31 13:40:03 -06:00
GhostIsSpooky
1013e1a2cc
Cargo - Improve config and fnc_getNameItem (#8777) 
* change macro, block rename statics

* change macro, block rename statics

* revert noRename, improve getName function

* fix derp
 2022-01-30 12:12:52 -06:00
Broström.A | Evul
00f35a3dae
Cargo - Add ability to disabled rename on object level (#8740) 
* Rename can be disabled on object level

- Added ability to stop renaming on object level

_Needs testing_

* Fixed extra ()

* Forgot one of the )

* Update cargo-framework.md

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-01-30 12:04:39 -06:00
Serg Vergun
f21a5e49d7
Add ability to define startup delay via config for AllVehicles (#8744) 2022-01-30 12:03:52 -06:00
GhostIsSpooky
9ff5d34ce7
Common - Add cache to fnc_isModLoaded (#8794) 
* add isModLoaded cache

* add missing brackets

* missed one

* Update fnc_handlePunjiTrapDamage.sqf

* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-01-30 11:56:20 -06:00
GhostIsSpooky
82e59f0578
RHS Compats - Add [CSW] prefix to magazines (#8798) 
* afrf csw prefix

* rhsusf magazines

* fix stringtable erros

* fix stringtables, second attempt

* missing STR_

* Add missing hyphen and capitalize F

Co-authored-by: Serg Vergun <1197314+severgun@users.noreply.github.com>
 2022-01-30 11:55:46 -06:00
Bailey Danyluk
7958f1dd9b
change name (#8805) 2022-01-30 11:54:30 -06:00
Whigital
1ea81f09a5
Fix RHS LMGs being classed as closed bolt systems (#8793) 2022-01-25 19:33:05 -06:00
mharis001
b368e09b45
Medical GUI - Improve descriptions for blood loss and damage color settings (#8779) 2022-01-24 17:38:06 -05:00
GhostIsSpooky
936dd5d978
Medical Treatment - Add ellipsis to 'Stitching' string (#8745) 
* add ellipsis to stitching string

* japanese is weird

Co-authored-by: Brett <brett@bmandesigns.com>

Co-authored-by: Brett <brett@bmandesigns.com>
 2022-01-19 17:50:53 -06:00
GhostIsSpooky
bd8ba24ee3
Mk6 Mortar - Add [CSW] prefix to magazines (#8780) 
* add csw prefix to magazines

* Update addons/mk6mortar/stringtable.xml

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

Co-authored-by: Jo David <github@jonathandavid.de>
 2022-01-19 17:35:27 -06:00
jtj5283449
4d53d9ce44
Translation - Korean v2.0 (#8768) 
* Add files via upload

* Add files via upload

* Delete stringtable.xml

* Delete advanced_ballistics directory

* Add files via upload

* Add files via upload

* Add files via upload

* Normalize line endings

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2022-01-12 14:41:09 -06:00
Drofseh
79c0510056
Overheating - Fix set temperature functions (#8770) 
* Fix set temperature functions

* fix example
 2022-01-12 12:41:50 -06:00
Eduard Schwarzkopf
3aab21da43
Translations - Add german translations (#8771) 
* Added german translations for common

* Added german translations for fire

* Added german translations

* Added german translations

* Update on german translation

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

* Updated german translation

Co-authored-by: Jo David <github@jonathandavid.de>
 2022-01-12 12:35:56 -06:00
GhostIsSpooky
4b108bc3ed
Fire - Add ellipsis & decapitalize 'patting down fire' string (#8753) 
* Add ellipsis & decapitalize 'patting down fire'

* japanese is weird

Co-authored-by: Brett <brett@bmandesigns.com>

Co-authored-by: Brett <brett@bmandesigns.com>
 2022-01-05 23:10:59 -06:00
GhostIsSpooky
285d0a0ac6
Medical - Capitalize 'Crushed Tissue' strings 2022-01-05 23:09:53 -06:00
PabstMirror
5f8131d2e6
Update setting-up-the-development-environment.md (#8765) 2022-01-05 23:09:21 -06:00