Commit Graph

12617 Commits

Author SHA1 Message Date
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
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