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,700 Commits 73 Branches 88 Tags 752 MiB
cd4d2a9cf6
Commit Graph

12833 Commits

Author SHA1 Message Date
lambdatiger
deecaf9249 Removed unneeded ground offset 2024-03-04 22:19:38 -06:00
johnb432
86580f3d6f
Fortify - Fix invalid object filtering (#9825) 
Actually filter object
 2024-03-04 14:01:40 -08:00
BrettMayson
f76485ff3a
Common - Fix addToInventory for magazines (#9823) 
fix addToInventory for magazines
 2024-03-04 14:00:31 -08:00
PabstMirror
f63704911e
CUP Compats - Don't load if cup's compats present (temporary) (#9824) 
* CUP Compats - Don't load if cup's compats present (temporary)

* cup veh and ter
 2024-03-04 15:20:59 -06:00
BrettMayson
67fa53fd2c
General - Events for Mods (#9813) 
* full heal local

* update body image

* log list

* better _enable in categories

* update injury list

* cardiac output internal variable

* typo

* remove duplicate event

* rename event

* add docs

* Update docs/wiki/framework/events-framework.md

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-04 15:08:12 -06:00
BrettMayson
a85a65331f
Medical GUI - Show Bleeding Rate (#9815) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-03 22:47:37 +00:00
BrettMayson
fd22ff04c5
Medical GUI - Display IV Type (#9817) 
Co-authored-by: MisczczuZPolski <71414303+MiszczuZPolski@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-03-03 19:45:12 -03:00
Fabio Schick
22deb3af79
Artillery - Add Rangetable Keybind, Fix remembering last charge (#9818) 2024-03-03 19:43:31 -03:00
lambdatiger
4583a0dc9c reformatted comments and some v2.18 remakrs comments 2024-03-02 23:55:32 -06:00
lambdatiger
ff98917639 Fixed function header 2024-03-02 22:46:55 -06:00
lambdatiger
98caad5936 initRound ordering and fixed define names 2024-03-02 22:33:40 -06:00
lambdatiger
fd2c59581a Fixed ordering in which frag hold off variables are set to not skip when unneeded 2024-03-02 22:31:30 -06:00
lambdatiger
9c6a919bb9 Do spall exits for time 90% of the time (round hits multiple walls) and should exit on "hitting ground since no spalling is generated 2024-03-02 22:29:41 -06:00
lambdatiger
4c905fed42 Clarified trace statements and corrected format and spelling 2024-03-02 22:28:41 -06:00
lambdatiger
5915d0ee64 removed unnceassary "disableCollisionWith" 2024-03-02 19:21:51 -06:00
lambdatiger
3e52ce2981 doFragRandom was always being called and spawning at least 5 fragments even when the fragment budget of 50 was reached. Fixed variable name (AGL instead of ATL). 2024-03-02 19:17:38 -06:00
lambdatiger
3cb07e8323 removed "_lo" random fragment entries as they are unused 2024-03-02 18:08:03 -06:00
lambdatiger
8a2f40c360 Changed sphere size and added return based on usage in dev_trackHitBox 2024-03-02 18:00:11 -06:00
lambdatiger
f57ac94325 Small coding standard changes (missing semicolons on non-return values, extra parenthesis) 2024-03-02 17:59:45 -06:00
lambdatiger
e3395c5a20 Removed unused stringtable entries & fixed hitbox description 2024-03-02 17:22:32 -06:00
Grim
64538f2ad0
Arsenal - Native baseWeapon support for CBA items (#9799) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-03-02 14:29:20 -03:00
Mike-MF
2036c83dc8
CUP Weapons Compat - Add WP NVGs (#9810) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-03-02 14:26:33 -03:00
johnb432
d6a37f3fde Change stringtable entries 2024-03-02 16:36:43 +01:00
johnb432
d6c21e0cc4 Made clear traces global again, added interaction condition 2024-03-02 14:54:19 +01:00
Apricot
b828a14afa
Translations - Improve Japanese localization (#9812) 
* update japanese

* update

* Update stringtable.xml

* dogtag wording to ID tag
 2024-03-01 19:23:33 -06:00
johnb432
480d2df446 Ignore curators and spectators 2024-03-01 19:51:51 +01:00
johnb432
279f2e0552 Formatting and header fixes 2024-03-01 19:51:21 +01:00
johnb432
fc745e49ab Removed outdated code 2024-03-01 19:14:07 +01:00
prisonerMO
8a67744cd4
Hearing - Keybind for putting or taking out earplugs (#9804) 
* Added keybind put or take out earplugs

* Update addons/hearing/XEH_postInit.sqf

Don't need to register keybinds on machines that don't have interfaces.

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/hearing/initKeybinds.inc.sqf

Removed default keybind, added new line at the end of the file and changed some code formatting, as well as some functions:

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/hearing/stringtable.xml

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-28 13:44:27 -06:00
kerckasha
bfbfc66d1c
SPE Compat - Fix flamethrower magazines not showing in arsenal / 50 Cal deafness (#9803) 
* Fixed old invalid type on SPE flamethrower magazines

* Added ACE_caliber to SPE 50 cal ammo as it was causing extreme deafness

* Update addons/compat_spe/CfgAmmo/bullets.hpp

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

* Fixed duplicate base classes

* Update addons/compat_spe/CfgAmmo/bullets.hpp

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/compat_spe/CfgMagazines/flamethrower.hpp

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-28 17:09:02 +01:00
Drofseh
c4688f2ae5
Compat WS - Add barrel swap to WS machine guns (#9808) 
Add barrel swap to WS machine guns
 2024-02-28 17:05:11 +01:00
Mike-MF
5111062e6d
Add CUP Vehicles Compatibility (#9602) 
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-02-28 16:50:07 +01:00
Mike-MF
147f28d443
Add CUP Weapons Compatibility (#9599) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-02-28 16:47:53 +01:00
lambdatiger
776c1f72b2
Merge branch 'acemod:master' into master 2024-02-20 20:32:46 -06:00
lambdatiger
05dedff99d reworked some function headers and deleted whitespace in doFragTargeted 2024-02-20 20:32:05 -06:00
V1nsyara
4d487dc33e
Translations - Russian (#9802) 
Update Russian Translate
 2024-02-20 19:22:38 -06:00
Sotirios Pupakis
fd7a5004f0
KillTracker - Add option to filter out AI unit kills (#9800) 
* Add option to disable AI kills tracking in Kill Tracker

Add an option to disable tracking of kills of AI units when using ACE Kill Tracker. Configurable through Addon Settings

* Made setting global

* Requested changes

* Omitted optional default params

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

* Added missing dot

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Added missing dot in Czech translation

* Update addons/killtracker/XEH_preInit.sqf

* Update addons/killtracker/XEH_preInit.sqf

---------

Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-19 17:53:47 -06:00
lambdatiger
b98aae7866 cleaned un-updated stringtable entries 2024-02-17 13:12:33 -06:00
lambdatiger
c3470de534
stopped adding unneeded extra points 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-17 13:04:19 -06:00
lambdatiger
dd65fc8f38
missing underscore in fnc_dev_trackObj 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-17 13:03:09 -06:00
lambdatiger
008328c7b0 reorganized postInit CBA_settingInitialized EH 2024-02-16 16:56:13 -06:00
lambdatiger
4728a56394 Cleaned up documentation and documentation 2024-02-16 16:54:53 -06:00
lambdatiger
7248496e62 optimized dev_trackHitbox and made variables more explicit 2024-02-16 16:40:27 -06:00
lambdatiger
a8778a6226 added changes to stringtable 2024-02-15 21:14:03 -06:00
lambdatiger
66c566b772 Possible shouldFrag legibility improvement 2024-02-15 21:05:31 -06:00
lambdatiger
4913887e36 added MP debug compatability 2024-02-15 21:05:08 -06:00
lambdatiger
6cbfe15c4c changed defaults to make them more clear they're just a default value 2024-02-15 21:04:05 -06:00
lambdatiger
dfdea2d9c7 function header and variable name readability 2024-02-15 21:03:29 -06:00
lambdatiger
78a27ff025 function header, lazy eval, and params list simplifications 2024-02-15 21:03:12 -06:00
lambdatiger
656fa9f7f7 fixed missing underscore in change from review 2024-02-15 21:01:02 -06:00
lambdatiger
c09c2a170c reformatted function headers, removed value type checking, and changed lazy eval. 2024-02-15 20:59:58 -06:00
lambdatiger
668d222a3f Removed blacklist functions and settings 2024-02-15 18:13:06 -06:00
lambdatiger
7e54280ee9 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-02-15 15:56:49 -06:00
lambdatiger
bc2a6bb9d9
small Should spall optimization 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 20:15:38 -06:00
lambdatiger
4ef23df3b3 white space, function headers and variable names 2024-02-14 20:07:19 -06:00
lambdatiger
a976b28c69 magic number clean up and white space 2024-02-14 19:57:49 -06:00
lambdatiger
ae116e2577 variable name changes 2024-02-14 19:55:26 -06:00
lambdatiger
4d9f61eeaf
Update addons/frag/functions/fnc_dev_drawTrace.sqf 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 18:50:01 -06:00
lambdatiger
61029ba723
Update addons/frag/functions/fnc_dev_addRound.sqf 
If the round isn't in the hashmap anymore, we have to stop the PFH.
Brought code up to same standard as used in FUNC(dev_trackObj). - johnb432

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 17:56:05 -06:00
lambdatiger
fa241cacb5
Removed doublespace 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 17:14:43 -06:00
lambdatiger
1da1c68803
Apply suggestions from code review 
Small formatting changes and small errors

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-14 16:50:09 -06:00
johnb432
fd5e56ffbc
Arsenal - Improved sorting, insignia detection, identity info verification and minor cleanup (#9795) 
* Changed sorting + minor cleanup

* Update addons/arsenal/functions/fnc_fillLeftPanel.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* check and log missing extended info

* fix extended loadout logging

* Made voice stuff config case

* use lowercase voice everywhere

* check loadout voice against configCase

* Update fnc_verifyLoadout.sqf

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

* Update addons/arsenal/functions/fnc_verifyLoadout.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 11:22:27 -08:00
BAXENdev
a0f3933bf0
Medical - Change max medication dosage behavior (#9746) 
* Consistentency Update with Overdosing

* Added Description to Condition Cases

* Updated to CASE 2

Overdose behavior:
ODs on uses `_maxDose + {1 or 2 or 3}` from `_maxDose + {0 or 1 or 2}`

* Update fnc_onMedicationUsage.sqf

* Update fnc_onMedicationUsage.sqf

* Added riskDose range and updated medications

* maxDose -> maxSafeDose | riskDose -> chanceDoses

* Fixed maxDose reference in trace

* Added chanceDoses to trace

* Fixed use of TRACE macro

* Updated comments and variable maxSafeDose -> maxDose

* Updated comment and overdose formula

* chanceDoses -> maxDoseDeviation

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/medical_treatment/ACE_Medical_Treatment.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-13 02:45:04 -08:00
johnb432
05a5ccd140
Arsenal - Add mod icons to editor arsenal attribute (#9797) 2024-02-12 15:15:48 -03:00
BrettMayson
1002dfe31b
Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
Grim
d6eb6b981c
Common - Allow multiple events to clear a cached call (#9770) 2024-02-11 22:13:37 -03:00
Grim
1e1d1d63f2
Arsenal - Add ace_arsenal_loadoutVerified event (#9792) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-11 20:25:12 -03:00
Grim
b2849aaa29
Fix filling loadouts list during preInit (#9794) 2024-02-11 20:21:29 -03:00
Grim
f3f9d18f55
Arsenal - Fill loadouts list over multiple frames (#9789) 2024-02-11 19:35:42 -03:00
Grim
bb7b05fd0d
Arsenal - Left panel code improvements (#9787) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-11 19:34:24 -03:00
Grim
95ec6eb765
Arsenal - Cleanup action UI code (#9784) 
* Arsenal - Cleanup action UI code

* derp
 2024-02-11 19:23:44 -03:00
Grim
a47ae27080
Nightvision - Register effects during preInit (#9788) 2024-02-11 13:55:48 -03:00
johnb432
cdc51643bb
Inventory - Remove duplicate code (#9791) 
Update XEH_preStart.sqf
 2024-02-11 07:33:58 -08:00
PabstMirror
e75ef3de06
General - Cleanup remaining HEMTT warnings/suggestions (#9786) 
* General - Cleanup remaining HEMTT warnings/suggestions

* Update addons/medical_engine/script_macros_medical.hpp
 2024-02-10 16:58:14 +01:00
Grim
6928adfc72
Arsenal - Improve performance of loadout verification (#9316) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-10 12:58:02 -03:00
lambdatiger
665707bbda a Brett (HEMTT) suggested change I miss 2024-02-08 17:29:03 -06:00
lambdatiger
a4c88ec713 removd unneeded define 2024-02-08 17:23:33 -06:00
lambdatiger
49c6187c17 Sync main repo 2024-02-08 17:19:54 -06:00
lambdatiger
2ad2564a1e removed all spaces from macros 2024-02-08 17:12:11 -06:00
lambdatiger
60543a5f59 added print incomplete only option to fnc_debugAmmo 2024-02-08 17:11:57 -06:00
lambdatiger
f63b4088eb Added commented 2.18 commands and updated script component 2024-02-08 17:11:36 -06:00
lambdatiger
07f055e16d updated some round types 2024-02-08 17:10:04 -06:00
Grim
ee79decb45
CSW - Code cleanup (#9777) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 20:36:13 -03:00
Grim
802560da8a
CSW - Delay init for CSW with simulation disabled (#9778) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 20:25:49 -03:00
BrettMayson
1649422cbd
Medical Vitals - Add SPO2 (#9360) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-07 17:50:18 -03:00
Fabio Schick
2f9b7002c3
Explosives - Add Cellphone/Detonator Keybinds (#9687) 
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-07 17:47:01 -03:00
johnb432
28e45c2979
Laser - Public getter and setter for laser codes (#9772) 
* Getter and setter for laser codes

* Documentation

* Sanitising input
 2024-02-07 08:49:36 -08:00
Grim
ae532c72f7
Medical - Prevent uncon AI from talking (#9776) 2024-02-07 12:56:24 -03:00
Smith
8731bcc8b5
Cargo - Add alternative unloading item from vehicle cargo (#8827) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-07 09:16:18 -03:00
Grim
e69ffb6f21
Arsenal Actions - Add support for multiline text & updating on cargo event (#9771) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-06 20:34:52 -03:00
johnb432
8de0740e94
Reload - Add manual reload for vehicle weapons - continued (#9398) 
* Add manual reload to turrets

* Added reload via reload keybind

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Update fnc_canSwapTurretMagazine.sqf

* Engine based reloading, added more checks

* Update addons/reload/functions/fnc_canSwapTurretMagazine.sqf

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-06 15:14:25 -08:00
Grim
244bee4a61
Medical Engine - Prevent uncon units from ragdolling on death (#9762) 2024-02-06 20:11:47 -03:00
Grim
77a49a081a
Small Arms - Fix magazineReloadTime for vehicle FN Minimi SPW (#9774) 2024-02-06 20:06:49 -03:00
johnb432
907758385c
Common - Cleanup define.hpp (#9773) 
Update define.hpp
 2024-02-06 09:29:24 -08:00
Mike-MF
5a3f3d3b82
Add CUP Terrains Compatibility (#9627) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
 2024-02-05 15:58:15 -03:00
Dystopian
b54992b8fc
Towing - Fix some issues (#9007) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 15:54:51 -03:00
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769) 
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
 2024-02-05 14:04:24 -03:00
Grim
6c60b67494
Arsenal - Exit refresh early if no display is found (#9754) 
Co-authored-by: Mike-MF <TyroneMF@hotmail.com>
 2024-02-05 10:57:22 -03:00
Grim
4bb9d6c42c
Medical - Add Painkillers (#9720) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-05 10:56:25 -03:00
johnb432
b440cf9cb2
Arsenal/RHS Compats - Removed bad illuminator stats for RHS attachments (#9766) 2024-02-04 16:24:14 -03:00
alexban011
f1e3753606
Common - Fix syntax error in fnc_disableUserInput.sqf (#9767) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 16:24:04 -03:00
Grim
5bd1fa7629
Common - Update header for FUNC(getWeight) (#9765) 2024-02-04 16:08:07 -03:00
Grim
ef9195f21a
Fix hellfire script error (#9764) 2024-02-04 15:12:13 -03:00
BrettMayson
1e404cf85b
General - SQF Improvements (#9698) 
Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
 2024-02-04 14:50:24 -03:00
johnb432
8d6555ad0f
Arsenal - Make face tab adhere to mod icon setting (#9763) 2024-02-04 14:45:23 -03:00
Joko
2a6fd19762
Cookoff - Improve ammo detonation sounds (#5327) 
* initital commit

* use Define for SOS

* fix some issues that got introduced in 1.70

* Prepare config for sounds

* add New Sounds 

improve distanced volume values

* add LAxemann to Author

* add Object Pooling

improve Distances

* fix small mistake

* change pool clearing timing

* change pool wait time

* fix Cookoff sound cleanup

* change to Jonpas Method

change random Distance add

* improve sound Volume over Distance (asked by Bux)

improve mid sounds

* improve a calculation

* Use playSound3D locally

* Make sounds configurable by 3rd party mods

* Added comments, used macros

* Update CfgSounds.hpp

---------

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-02-04 01:36:59 -08:00
Grim
7696d9aa2e
Cargo - Fix object lock when failling to load a carried object (#9759) 2024-02-04 06:09:15 -03:00
Apricot
a97a8dbb73
Translations - Improve/Add Japanese localization (#9760) 2024-02-04 05:57:39 -03:00
johnb432
6ba46ffa90
Map Tools - Code cleanup (#9750) 
* Maptools cleanup

* Changed conditions to check

* Minor cleanup + fix
 2024-02-03 10:48:21 -08:00
PabstMirror
c150d923f7
Map Tools - Fix tools showing after item is dropped out of inventory (#9749) 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-22 19:44:57 -03:00
Grim
7bc3fab533
Medical - Fix getting no pulse on a dead patient receiving CPR (#9756) 
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
 2024-01-22 19:44:42 -03:00
Grim
4470b1f341
Cargo - Show item and vehicle in progress bar text (#9747) 
* improve cargo progress bar text

* spanish

---------

Co-authored-by: BrettMayson <brett@mayson.io>
 2024-01-22 16:41:46 -06:00
PabstMirror
7e255bf05b
Tools - Fix header arg types (#9752) 
Fix header arg types
 2024-01-22 16:33:30 -06:00
lambdatiger
fd6b9bcee1 Removed double space 2024-01-21 17:08:59 -06:00
lambdatiger
35400620c7 Increased relative chance to hit torso/pelvis when fragemnt should hit. 2024-01-21 17:08:48 -06:00
lambdatiger
33afd8ab33 Merge branch 'ACE_advancedThrowing-shotParent-issue' 2024-01-20 18:57:56 -06:00
Mike-MF
d8961c68d6
Add CUP Units Compatibility (#9649) 2024-01-20 22:29:40 +01:00
lambdatiger
2e6186c09b Changed case output to match config 2024-01-19 13:32:22 -06:00
lambdatiger
40b9cd3c41 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-18 19:38:54 -06:00
lambdatiger
2d9828de91 removed unneeded toLower 2024-01-18 19:16:39 -06:00
lambdatiger
00dc4193ad changed SPG-9 Fragments 2024-01-18 18:22:17 -06:00
lambdatiger
863692625d optimization, see https://github.com/acemod/ACE3/pull/9728#discussion_r1458112339 2024-01-18 18:21:39 -06:00
lambdatiger
a3efede64f Fixe bad search function 2024-01-18 16:01:11 -06:00
lambdatiger
f3788afc89 Since the functions always exist, I guess these variables should too 2024-01-18 16:00:42 -06:00
lambdatiger
5f1cf0b4b6 saving people from their own bad testing setup 2024-01-18 16:00:15 -06:00
lambdatiger
78a15b1d5c
Optimize dev_hitbox deleting 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-18 15:13:36 -06:00
lambdatiger
8b3826a78c
white space for clarity 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-18 15:10:31 -06:00
lambdatiger
4ebbc28948 Makes sure spall power square root is positive and also we don't produce fragments when for some reason the round accelerates. 2024-01-18 02:59:08 -06:00
lambdatiger
722e86a200 Removed extra text from CfgAmmoFragParameters 2024-01-18 02:54:19 -06:00
lambdatiger
59bf6e3b91 Shot parent possible fix #1 2024-01-17 23:13:31 -06:00
lambdatiger
a4f2ad45d8 Updated debug settings 2024-01-17 21:53:20 -06:00
lambdatiger
f7417377e5 Mactched format https://github.com/acemod/ACE3/pull/9728#discussion_r1454926681 2024-01-17 21:52:47 -06:00
lambdatiger
85df838aab variable names weren't verbose enough 2024-01-17 21:39:54 -06:00
lambdatiger
13834d7f17 Switched debug clear traces from addAction to ACE self interact 2024-01-17 21:28:53 -06:00
lambdatiger
c921b1f9b4 removed unused debug GVAR 2024-01-17 21:28:07 -06:00
lambdatiger
63d67df7bf removed spurious commas 2024-01-17 21:11:38 -06:00
lambdatiger
35592fa0af removed 2 argument option and removed some defaults 2024-01-17 20:52:25 -06:00
lambdatiger
9bcf2b7650 white space and define placement changes 2024-01-17 20:51:59 -06:00
lambdatiger
8b45d0aa17 Updated function headers 2024-01-17 20:51:34 -06:00
lambdatiger
df884dc4bc changed default arguments, check isKindOf to "CAManBase" 2024-01-17 20:50:20 -06:00
lambdatiger
183d9f0ac6 capitization from cfg to Cfg in config lookups 2024-01-17 20:48:27 -06:00
lambdatiger
da1d184009 changed params statement, function header, and propigated doFrag argument changes 2024-01-17 20:46:15 -06:00
lambdatiger
3f84a45dee https://github.com/acemod/ACE3/pull/9728#discussion_r1454832701 2024-01-17 20:44:28 -06:00
lambdatiger
1f294f52f9 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-17 19:48:33 -06:00
lambdatiger
0321b78385 Moved "isServer" check to initRound function 2024-01-17 19:41:07 -06:00
lambdatiger
a1c498d338 clarified function description and removed unneeded comments 2024-01-17 19:40:12 -06:00
lambdatiger
ea15eeaee9
Removed superfulous parenthese 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 19:03:19 -06:00
lambdatiger
73d0064607 Removed white space from removing an if statement in a previous commit 2024-01-17 18:54:13 -06:00
lambdatiger
51603619e6 optimized around checking if systems are active and moved debug arguments to an ifdef 2024-01-17 18:53:45 -06:00
lambdatiger
c0c423bb83 Declared _ammoInfo twice 2024-01-17 18:52:55 -06:00
lambdatiger
e5f62c71d2
unneeded parens 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:34:08 -06:00
lambdatiger
b6891b729d
formatting changes 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:24:54 -06:00
lambdatiger
3cc300a04d
another great isNotEqualTo opportunity 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:23:12 -06:00
lambdatiger
16128721e0
Function header changes 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:20:47 -06:00
lambdatiger
0958d6a33b
Update addons/frag/functions/fnc_dev_addRound.sqf 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:07:11 -06:00
lambdatiger
1b03ef7d52
getposATL to getPosATL 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:05:26 -06:00
lambdatiger
cdf1b4d6eb
Clarified arguments 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:04:38 -06:00
lambdatiger
16e699e387
unneeded parens 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 18:03:44 -06:00
lambdatiger
4727386c07
Git rid of superfulous stringtable entries 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-17 17:47:07 -06:00
PabstMirror
4756bb6f8c Prepare 3.16.3 Build 79 2024-01-17 09:27:10 -06:00
lambdatiger
4be8c821cb Better approach to ACE_FRAG_RM_EH macro 2024-01-16 22:47:42 -06:00
lambdatiger
63cba6b006 clarified a hold off variable 2024-01-16 15:49:20 -06:00
lambdatiger
769bb29342 Changed how spall hold off is calculated to avoid repeated unneeded computations 2024-01-16 15:43:14 -06:00
lambdatiger
9178611a16 Debug updated to be easier to control 2024-01-16 15:41:10 -06:00
lambdatiger
6dacd38101 Few quick optimizations of == to isEqualTo 2024-01-16 15:40:51 -06:00
lambdatiger
8dd76d1ba6 Changes as discussed here https://github.com/acemod/ACE3/pull/9728#discussion_r1453104308 2024-01-16 15:39:16 -06:00
lambdatiger
7aa17aa91b Grammatical erros 2024-01-16 15:38:47 -06:00
johnb432
824679e40a
Common - Fixed status effects (#9741) 2024-01-16 16:20:40 -03:00
PabstMirror
8a2196417f Prepare 3.16.2 Build 78 2024-01-16 09:38:54 -06:00
PabstMirror
f2984b6fdb Merge branch 'master' into release-3.16.2 2024-01-16 09:38:25 -06:00
Grim
42e2e08c2b
Common - Add JIP support to status effects (#9740) 
* add JIP support to status effects

* fix TRACE

* typo
 2024-01-16 09:37:57 -06:00
johnb432
b02d95cb91
Arsenal - Fixed stats & actions appearing when they shouldn't be (#9737) 2024-01-16 12:30:27 -03:00
PabstMirror
ddc80dfaff Prepare 3.16.2 Build 77 2024-01-16 09:18:20 -06:00
PabstMirror
ef24ca8b99 Merge branch 'master' into release-3.16.2 2024-01-16 09:17:59 -06:00
PabstMirror
edf627ce51
Dragging - Add logging for claimSafe failure (#9739) 2024-01-16 09:16:51 -06:00
Grim
9eb7e83e59
Medical Engine - Don't skip hdbracket ever (#9738) 2024-01-15 23:41:26 -03:00
lambdatiger
572f9093f7 formatting whitespace 2024-01-15 19:57:52 -06:00
lambdatiger
67ede76494 compacted text a bit 2024-01-15 19:57:31 -06:00
lambdatiger
85b566a176 removed old parameter changed in f28d5d2372 2024-01-15 19:06:32 -06:00
lambdatiger
67e125cc43 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 18:50:40 -06:00
lambdatiger
b7807044bf white space/formatting changes 2024-01-15 18:47:21 -06:00
lambdatiger
b2666fceec Config lookup optimization mentioned by johnb432 here: https://github.com/acemod/ACE3/pull/9728#discussion_r1452726505 2024-01-15 18:47:06 -06:00
lambdatiger
c4a93c775d Implemented changes discussed here https://github.com/acemod/ACE3/pull/9728#discussion_r1452726904 2024-01-15 18:44:15 -06:00
lambdatiger
a8e268cdff
Optimized approach to classifying blacklist type 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-15 18:40:03 -06:00
lambdatiger
f713791602 fixed a loop that got caught in the merge crossfire 2024-01-15 18:35:26 -06:00
lambdatiger
e3c8e8d6ab Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 18:18:58 -06:00
lambdatiger
bd33ab0e91 removed return of sphere object, not required or useful. 2024-01-15 18:16:40 -06:00
lambdatiger
902af64d7e
avoid mismatch sides when debugging frags with unconcious or captive shooters 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-15 18:16:06 -06:00
lambdatiger
4ef116643d
Small optimization to optimize config lookup 
quick testing shows a whole 600ns increase in

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-15 18:10:30 -06:00
lambdatiger
d683be853f Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 17:55:37 -06:00
lambdatiger
6e209ba4f0
slight performance increase using forEach loops 
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
 2024-01-15 17:54:22 -06:00
lambdatiger
6fc950a5f1 Comments fixed 2024-01-15 17:53:12 -06:00
lambdatiger
dd7fc86295 fixed comment to properly state variable purpose 2024-01-15 17:40:31 -06:00
lambdatiger
133f0b1da4 Updated type checks in line with recommendation from johnb432 2024-01-15 17:36:02 -06:00
johnb432
5903e561a9
Arsenal - Add thermal vision support to scopes vision mode stat (#9736) 2024-01-15 19:40:36 -03:00
lambdatiger
3874146b23 formatting 2024-01-15 16:32:43 -06:00
lambdatiger
3957a0751f Fixed debug mode init, a few things pointed out by johnb432 that I was dumb not to do 2024-01-15 16:30:50 -06:00
lambdatiger
c05be02530 formatting 2024-01-15 16:27:29 -06:00
lambdatiger
054b9cda23 fixed more spacing issues 2024-01-15 16:13:48 -06:00
lambdatiger
96dc215f09 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-01-15 16:10:55 -06:00