Commit Graph

12654 Commits

Author SHA1 Message Date
johnb432
d6c21e0cc4 Made clear traces global again, added interaction condition 2024-03-02 14:54:19 +01: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
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