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
15,124 Commits 73 Branches 88 Tags
04238fd382fb0f137d21802a589da44fe1176218
Commit Graph

15124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Grim
cc1636c14f Repair - Change Repair Threshold setting descriptions (#9242) 
* change stringtable

* change setting to % slider

* keep old translations
 2023-07-06 06:51:00 +03:00
Grim
c7e13ca4c7 Repair - Move to separate settings menu (#9236) 
* Repair - Move from logistics settings menu

* Repair - Move from logistics settings menu
 2023-07-03 16:00:46 +03:00
Grim
ba4fcf615d Medical GUI - Add setting to show Damage (#8444) 
* use pain variable for severe pain and use threshold in damage color calculation

show % of damage threshold in medical menu

* use damage taken instead of damage left

* Add setting and switch to separate tooltip

* tooltip -> entry

* Change display names and tooltip

* switch to qualitative

* remove newlines

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
Co-authored-by: BrettMayson <brett@mayson.io>
 2023-07-01 01:37:08 +03:00
Dystopian
22b93e2d03 Vehicles - Add Resume/Set functionality to speed control (#8967) 
* Add Resume/Set functionality to speed control

* Apply suggestions from code review

Co-authored-by: BrettMayson <brett@mayson.io>

---------

Co-authored-by: BrettMayson <brett@mayson.io>
 2023-06-28 17:17:14 +03:00
Dystopian
8b94d765aa Dragging - Allow run when carrying light-weight objects (#8338) 
* Allow run when carrying light-weight objects

* Use global var instead of macro

* Update addons/common/XEH_postInit.sqf

---------

Co-authored-by: jonpas <jonpas33@gmail.com>
 2023-06-28 14:43:10 +03:00
PabstMirror
f812daa095 Javelin - Fix weapon being in top-attack when loading AP magazine (#9161) 
Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-06-28 12:55:45 +02:00
JonBons
055503928c Vehicle Damage - Fix incoming damage from blank hit selection resulting in absurd damage values (#9194) 2023-06-28 13:39:33 +03:00
BrettMayson
10c1085aba Repair - Add wheel patching (#8835) 
* patch wheels on vehicles

* all tire patching working

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>

* doc

* remove unused string

* Update CfgVehicles.hpp

* use strintable

* setting for where the wheel can be patched

* localize

* Update stringtable.xml

* can't patch a missing tire

* removal > replacement

* Update addons/repair/initSettings.sqf

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

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* patch icon

* use PATCH_WHEEL_STEP_TIME

* fix wheel translation

---------

Co-authored-by: mp-singh <mandeep@mandeepsingh.ca>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-06-28 13:39:08 +03:00
pterolatypus
f434549faf Medical Treatment - Change stitching action to be per-body-part (#9005) 
* Make stitching action per-body-part

* Apply suggestions from code review

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

---------

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-06-28 01:43:45 +03:00
PabstMirror
4f0577ce5f Medical Engine - Ignore Reflector Hitpoints (#9131) 2023-06-27 19:41:10 +03:00
pterolatypus
4a3ad40c04 Adv Fatigue - Make stamina penalty for weapon raised/ready scale with weapon inertia (#8669) 
* Stamina penalty for weapon raised/ready is scaled by weapon inertia

* Newline

* Tabs

my editor hates me

* Use format

* Improved item validation and caching
 2023-06-27 19:40:07 +03:00
Grim
8319dafcba add icons for SOG csw (#9230) 2023-06-27 10:47:33 +03:00
Grim
2571550bbc Intel Items - Change scope for better Arsenal filtering (#9228) 
* scope changes

* review change
 2023-06-27 10:46:56 +03:00
Grim
d0f43abbb2 add dlc config entry (#9229) 2023-06-27 01:01:09 +03:00
Cyruz
aa21ba50a9 Cookoff - Improve destroying vehicle post cookoff (#9029) 
* Have vehicle explode when cookoff completes

* Adjust strings

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-06-25 01:06:26 -03:00
Kyle Mckay
02365609b5 Medical - Change medical to use hashmaps for wound storage (#8926) 
* Refactor medical to use hashmaps for wound storage

- We most frequently want to access wounds by body part, so this makes
  that a constant time lookup.
- The body part index is no longer stored in every wound since it's
  inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
  clarity (no more magic numbers).

closes #6468

* Add deserilization migration from old wound arrays

Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.

* fix issue with suture stitching

* change version number in comment

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-06-24 08:11:56 +03:00
Crowdedlight
6181616cc3 Fire - Fix fire spread to invincible units and not being able to be put on fire by proximity if multiple units are on fire (#8632) 
* fire do not propagate to close unit if allowDamage is disable don that unit

* change burnCounter so it works with multiple instances of fires

* fixed exiting burning not resetting burn counter

* changed !isEqualTo to isNotEqualTo

* changed !isEqualTo to isNotEqualTo

* lazy eval, respect old allowDamage variable

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: Salluci <salluci.lovi@gmail.com>
 2023-06-24 05:34:31 +03:00
Mathew Horner
78c1ce3ae9 Logistics Wirecutter - Check if fence model is in FENCE_P3DS even if config check fails. (#9201) 
* Check if fence model is in FENCE_P3DS even if config check fails.

* Fix early return condition

* Simplify condition
 2023-06-24 05:10:04 +03:00
Wakbub
117c3092f8 Common - Fix added throwables not being throwable (#9186) 
Replace
- addMagazineCargoGlobal with addItemTo(Uniform/Vest/Backpack to make added throwables throwable.
 2023-06-24 05:09:30 +03:00
Filip Maciejewski
beffc7660c Fire - Loop "Pat down" action until patient is put out of fire (#9017) 
* Adjust burn intensity defines and move to shared

* Loop "Pat down" action until patient is put out of fire

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-06-24 05:08:23 +03:00
BaerMitUmlaut
728f556ae4 Medical AI - Use suppressed EH to determine safety of AI (#8242) 
* Use suppressed EH to determine safety of AI

* Require CBA 3.15.3

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BrettMayson <brett@mayson.io>
 2023-06-23 18:59:11 -03:00
Ampersand
e5654914cc Dragging - Improve carrying by allowing carried object to be loaded into vehicle by key or mouse (#9138) 
* load carried object

* check for medical loaded

* space

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

* consolidate mouse hint in pfh

---------

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>
 2023-06-23 15:11:16 +03:00
Laid3acK
b75d20634b Ballistics - Add 12.7x108mm APDS AB values (#9191) 
* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

* 127x108_apds_compat_ace3

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2023-06-22 16:01:09 +03:00
Laid3acK
4aacbb960f Ballistics - Improve B_127x108_Ball values (#9192) 
* 127x108_compat_ace3

* 127x108_compat_ace3

* 127x108_compat_ace3
 2023-06-22 04:35:44 -03:00
Kam
1e6073c467 give tourniquet to patient or medic depending on setting (#9206) 2023-06-22 04:26:28 -03:00
Grim
34c5988333 Frag/Medical Damage - Treat shrapnel as grenade damage (#9218) 
* treat shrapnel as grenades

* switch to frag
 2023-06-22 04:06:52 -03:00
Laid3acK
626d886b3b Hearing - Remove outdated 12.7x108mm audibleFire value (#9193) 
* 127x108_hearing

* 127x108_hearing
 2023-06-22 04:06:07 -03:00
Grim
793ef7bba5 Dragging - Use improved loadAbs for weight calculation (#8457) 
* use improved loadAbs for weight calculation

* fix double counted backpack cargo

---------

Co-authored-by: Salluci <69561145+Salluci@users.noreply.github.com>
 2023-06-22 04:04:19 -03:00
Zachary Dunn
864d2e9eee Explosives - Add "ace_explosives_setup" CBA Event (#9197) 2023-06-20 13:36:57 -06:00
Grim
49f4ea23e7 Docs - Add Grim to maintainers (#9223) 
* secret handshake?

* fix my name

* new github username
 2023-06-19 16:31:17 +03:00
BrettMayson
7ed1c1f4cb Docs - Move BrettMayson to maintainers (#9222) 2023-06-19 07:17:04 -06:00
Mike-MF
888ac6c9bc Arsenal - Fix null comparison (#9213) 2023-06-10 18:59:13 +02:00
Abogado
3d3aa8d877 Update Spanish translation (#9203) 
An update of the spanish to the text strings that have been added lately.
 2023-05-29 18:22:37 -05:00
jonpas
eab93f739a Tools - Make HEMTT releases equivalent to older releases (#9200) 2023-05-16 15:27:28 +02:00
KJW
fd3c9c967d Medical Treatment - Improve Medical Actions underwater (#9096) 2023-05-15 23:47:00 -06:00
jonpas
18074fde43 Documentation - Fix sentence typo in file patching setup 2023-05-15 04:53:08 +02:00
Riott
23d7f340ee Chemlights - Improve chemlights doc to include illumination length (#9187) 2023-05-03 19:00:25 +02:00
PabstMirror
2e54ee7bee Explosives - Add getVar to disable setShotParents (#9190) 
* Explosives - Add getVar to disable setShotParents

* Update docs/wiki/framework/explosives-framework.md
 2023-05-03 11:55:02 -05:00
PabstMirror
fedefd5799 SOG Compat - Fix compatibility with grad trenches (__has_include) (#9189) 2023-05-01 19:40:16 +02:00
Ellis Nielsen
cd41594a60 Towing - Add CBA event for towing start and cancel (#9178) 
Co-authored-by: commy2 <commy-2@gmx.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-05-01 19:39:22 +02:00
Bob-Murphy
3af1cf925f Refuel - Add Land_vn_b_prop_fueldrum_01 compat (#9172) 2023-05-01 19:37:50 +02:00
jonpas
d279a8e607 Documentation - Cleanup function documentation output 2023-05-01 17:38:27 +02:00
jonpas
48a4e9682c Forbit use of (optional) in function headers, always require a value 2023-05-01 17:33:07 +02:00
jonpas
c4c4156c0a Documentation - Only split the wanted ul into columns 2023-05-01 17:25:29 +02:00
jonpas
5c48f08a42 Style document functions function 2023-05-01 17:16:56 +02:00
jonpas
7c2d6ae72b Fix functions documentation header duplication 2023-05-01 17:15:48 +02:00
jonpas
5e83add1c7 Deploy to Netlify 2023-05-01 17:03:58 +02:00
jonpas
36a90a94aa Cleanup and test pages 2023-05-01 17:03:58 +02:00
Cre8or
19e72d7b71 Explosives - Fix incorrect shotParents (#9171) 
* Update fnc_setupExplosive.sqf

- Added `setShotParents` to the resulting explosive, enabling support for kill tracking

* Add setShotParents to fnc_placeExplosive

* Remove setShotParents from fnc_setupExplosive

* Move setShotParents into place event

* fix tabs

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2023-04-30 17:06:44 -05:00
PabstMirror
52842b6f14 Scopes - Add tool to diagnose scope height (#9152) 
* Scopes - Add tool to diagnose scope height

* fix ico_01, tws_mg scopes
 2023-04-30 16:57:34 -05:00