Commit Graph

15698 Commits

Author SHA1 Message Date
c09c2a170c reformatted function headers, removed value type checking, and changed lazy eval. 2024-02-15 20:59:58 -06:00
668d222a3f Removed blacklist functions and settings 2024-02-15 18:13:06 -06:00
7e54280ee9 Merge branch 'master' of https://github.com/lambdatiger/ace_frag-overhaul 2024-02-15 15:56:49 -06:00
bc2a6bb9d9 small Should spall optimization
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-14 20:15:38 -06:00
4ef23df3b3 white space, function headers and variable names 2024-02-14 20:07:19 -06:00
a976b28c69 magic number clean up and white space 2024-02-14 19:57:49 -06:00
ae116e2577 variable name changes 2024-02-14 19:55:26 -06:00
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
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
fa241cacb5 Removed doublespace
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-14 17:14:43 -06:00
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
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
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
05a5ccd140 Arsenal - Add mod icons to editor arsenal attribute (#9797) 2024-02-12 15:15:48 -03:00
1002dfe31b Grenades - Flashbang events (#9796) 2024-02-12 14:01:24 -03:00
d6eb6b981c Common - Allow multiple events to clear a cached call (#9770) 2024-02-11 22:13:37 -03:00
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
b2849aaa29 Fix filling loadouts list during preInit (#9794) 2024-02-11 20:21:29 -03:00
f3f9d18f55 Arsenal - Fill loadouts list over multiple frames (#9789) 2024-02-11 19:35:42 -03:00
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
95ec6eb765 Arsenal - Cleanup action UI code (#9784)
* Arsenal - Cleanup action UI code

* derp
2024-02-11 19:23:44 -03:00
a47ae27080 Nightvision - Register effects during preInit (#9788) 2024-02-11 13:55:48 -03:00
cdc51643bb Inventory - Remove duplicate code (#9791)
Update XEH_preStart.sqf
2024-02-11 07:33:58 -08:00
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
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
41c7b12acb Documentation - Fix Wiki AtragMx links (#9780) 2024-02-10 12:52:36 -03:00
665707bbda a Brett (HEMTT) suggested change I miss 2024-02-08 17:29:03 -06:00
a4c88ec713 removd unneeded define 2024-02-08 17:23:33 -06:00
49c6187c17 Sync main repo 2024-02-08 17:19:54 -06:00
2ad2564a1e removed all spaces from macros 2024-02-08 17:12:11 -06:00
60543a5f59 added print incomplete only option to fnc_debugAmmo 2024-02-08 17:11:57 -06:00
f63b4088eb Added commented 2.18 commands and updated script component 2024-02-08 17:11:36 -06:00
07f055e16d updated some round types 2024-02-08 17:10:04 -06:00
ee79decb45 CSW - Code cleanup (#9777)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-02-07 20:36:13 -03:00
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
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
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
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
ae532c72f7 Medical - Prevent uncon AI from talking (#9776) 2024-02-07 12:56:24 -03:00
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
6637a15af9 Documentation - Update Wiki AtragMx (#9608)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-07 07:30:50 -03:00
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
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
244bee4a61 Medical Engine - Prevent uncon units from ragdolling on death (#9762) 2024-02-06 20:11:47 -03:00
77a49a081a Small Arms - Fix magazineReloadTime for vehicle FN Minimi SPW (#9774) 2024-02-06 20:06:49 -03:00
907758385c Common - Cleanup define.hpp (#9773)
Update define.hpp
2024-02-06 09:29:24 -08:00
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
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
a3aef6a066 General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
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