Commit Graph

15755 Commits

Author SHA1 Message Date
6ea0312770 Overheating - Increase cooling for open bolt guns and spare barrels (#9827)
* open bolt and spare barrel cooling boost

* change magic number to macro
2024-03-06 09:45:41 -08:00
78334e2be4 Refuel - Add ownership concept to nozzles & jerry cans (#9826)
Add ownership concept to nozzles & jerry cans
2024-03-05 11:55:59 -08:00
61ca55f268 Translations - Improve Japanese localization 2 (#9829)
Update stringtable.xml
2024-03-05 12:42:38 -06:00
deecaf9249 Removed unneeded ground offset 2024-03-04 22:19:38 -06:00
86580f3d6f Fortify - Fix invalid object filtering (#9825)
Actually filter object
2024-03-04 14:01:40 -08:00
f76485ff3a Common - Fix addToInventory for magazines (#9823)
fix addToInventory for magazines
2024-03-04 14:00:31 -08:00
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
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
Kex
b1520a9aaf Improve version badge (#9822)
Replace hard-coded version badge
2024-03-03 19:51:43 -06:00
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
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
22deb3af79 Artillery - Add Rangetable Keybind, Fix remembering last charge (#9818) 2024-03-03 19:43:31 -03:00
4583a0dc9c reformatted comments and some v2.18 remakrs comments 2024-03-02 23:55:32 -06:00
ff98917639 Fixed function header 2024-03-02 22:46:55 -06:00
98caad5936 initRound ordering and fixed define names 2024-03-02 22:33:40 -06:00
fd2c59581a Fixed ordering in which frag hold off variables are set to not skip when unneeded 2024-03-02 22:31:30 -06:00
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
4c905fed42 Clarified trace statements and corrected format and spelling 2024-03-02 22:28:41 -06:00
5915d0ee64 removed unnceassary "disableCollisionWith" 2024-03-02 19:21:51 -06:00
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
3cb07e8323 removed "_lo" random fragment entries as they are unused 2024-03-02 18:08:03 -06:00
8a2f40c360 Changed sphere size and added return based on usage in dev_trackHitBox 2024-03-02 18:00:11 -06:00
f57ac94325 Small coding standard changes (missing semicolons on non-return values, extra parenthesis) 2024-03-02 17:59:45 -06:00
e3395c5a20 Removed unused stringtable entries & fixed hitbox description 2024-03-02 17:22:32 -06:00
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
2036c83dc8 CUP Weapons Compat - Add WP NVGs (#9810)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-03-02 14:26:33 -03:00
d6a37f3fde Change stringtable entries 2024-03-02 16:36:43 +01:00
d6c21e0cc4 Made clear traces global again, added interaction condition 2024-03-02 14:54:19 +01:00
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
480d2df446 Ignore curators and spectators 2024-03-01 19:51:51 +01:00
279f2e0552 Formatting and header fixes 2024-03-01 19:51:21 +01:00
fc745e49ab Removed outdated code 2024-03-01 19:14:07 +01:00
6de7d60636 CI - Use Node.js 20 actions (#9809) 2024-02-29 04:54:08 +01:00
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
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
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
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
147f28d443 Add CUP Weapons Compatibility (#9599)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2024-02-28 16:47:53 +01:00
776c1f72b2 Merge branch 'acemod:master' into master 2024-02-20 20:32:46 -06:00
05dedff99d reworked some function headers and deleted whitespace in doFragTargeted 2024-02-20 20:32:05 -06:00
4d487dc33e Translations - Russian (#9802)
Update Russian Translate
2024-02-20 19:22:38 -06:00
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
b98aae7866 cleaned un-updated stringtable entries 2024-02-17 13:12:33 -06:00
c3470de534 stopped adding unneeded extra points
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-17 13:04:19 -06:00
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
008328c7b0 reorganized postInit CBA_settingInitialized EH 2024-02-16 16:56:13 -06:00
4728a56394 Cleaned up documentation and documentation 2024-02-16 16:54:53 -06:00
7248496e62 optimized dev_trackHitbox and made variables more explicit 2024-02-16 16:40:27 -06:00
f4dc05283b Grammar sweep on the wiki, and added some clarifications to config values 2024-02-15 21:59:07 -06:00
a8778a6226 added changes to stringtable 2024-02-15 21:14:03 -06:00