johnb432
|
a2909a97d4
|
Merge branch 'master' into pr/9758
|
2024-02-13 01:44:29 +01:00 |
|
johnb432
|
9a7c293286
|
Update CfgEden.hpp
|
2024-02-13 01:44:23 +01:00 |
|
johnb432
|
07b73c9a55
|
Update fnc_cookOff.sqf
|
2024-02-13 01:41:58 +01:00 |
|
johnb432
|
bdb33d4dac
|
Fixed brackets
|
2024-02-13 01:39:14 +01:00 |
|
johnb432
|
2cdc40a958
|
Converted enable setting to bool
|
2024-02-13 01:34:58 +01: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 |
|
johnb432
|
0663bd16c9
|
Added incendiary rounds as source of box cookoff
|
2024-02-11 11:20:01 +01: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 |
|
Laid3acK
|
41c7b12acb
|
Documentation - Fix Wiki AtragMx links (#9780)
|
2024-02-10 12:52:36 -03:00 |
|
johnb432
|
e541b337c5
|
Fixed objects not being able to cook-off again
|
2024-02-08 13:08:45 +01:00 |
|
johnb432
|
370f141776
|
Merge branch 'master' into pr/9758
|
2024-02-08 11:11:13 +01: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
|
0deada7a3d
|
Prevent double ammo detonation
|
2024-02-07 17:58:59 +01: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 |
|
johnb432
|
db3fc19e22
|
Merge branch 'master' into pr/9758
|
2024-02-07 12:19:15 +01:00 |
|
Laid3acK
|
6637a15af9
|
Documentation - Update Wiki AtragMx (#9608)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
|
2024-02-07 07:30:50 -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 |
|
johnb432
|
2646cc12ce
|
Update XEH_postInit.sqf
|
2024-02-06 10:36:18 +01:00 |
|
johnb432
|
d277fa9f67
|
Tweaks
|
2024-02-06 10:32:13 +01:00 |
|
johnb432
|
51aa46c81f
|
Separate effect handling
|
2024-02-06 01:06:30 +01:00 |
|
johnb432
|
0ec391a3a5
|
Merged main
|
2024-02-05 22:38:39 +01: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 |
|
johnb432
|
ed4cea6c4a
|
Various improvements
|
2024-02-05 17:31:27 +01: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
|
0de629ec2e
|
Update events-framework.md
|
2024-02-05 13:28:13 +01: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 |
|