Commit Graph

77 Commits

Author SHA1 Message Date
johnb432
179d713473 Merge branch 'master' into pr/9234 2024-07-26 17:41:04 +02:00
johnb432
cd66f495ad
CSW - Improve tripod and weapon disassembly (#9915)
* Add disassembly for tripods when players have occupied launcher slots

* Update fnc_assemble_canDeployWeapon.sqf

* Update fnc_assemble_canPickupWeapon.sqf

* Revert file renaming (see #9777)

* Correct headers

* Update fnc_canPickupTripod.sqf

* Fixed checks and eject dead bodies

* Invert checks
2024-06-22 19:39:36 +02:00
johnb432
1f5044aabd
CSW - Improved weapon attachments handling (#9904) 2024-06-22 14:03:32 -03:00
Mike-MF
1c6c4d6bff
All - Fix parentheses around code (#10073)
* Fix Brackets around code

* Update fnc_handleFired.sqf

* Shouldn't have changed this one

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2024-06-18 14:08:03 +00:00
johnb432
c634bbe1ab
CSW - Force QGVAR(handleExtraMagazinesType) to be respected (#9903)
Force QGVAR(handleExtraMagazinesType) to be respected
2024-05-23 21:56:28 +02:00
johnb432
316bb355ad
CSW - Minor code cleanup (#9902)
CSW minor code cleanup
2024-04-02 08:22:45 -07:00
johnb432
a5a3fe4232
CSW - Deploy & pickup CSW parts only if they are not destroyed (#9905)
Deploy & pickup CSW parts only if they are not destroyed
2024-04-02 08:15:06 -07:00
Grim
e06c6f7835
General - Replace toLower with toLowerANSI where applicable (#9790)
* General - Replace toLower with toLowerANSI where applicable

* whoops

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/repair/functions/fnc_setHitPointDamage.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/repair/dev/draw_showRepairInfo.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/tagging/XEH_preStart.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/vehicle_damage/functions/fnc_handleCookoff.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update addons/tagging/XEH_preStart.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* comparment -> compartment

* Update fnc_showHud.sqf

* Update fnc_registerObjects.sqf

* Update addons/common/functions/fnc_cbaSettings_settingChanged.sqf

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2024-03-07 22:08: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
johnb432
ee6a9532ea
Update addons/csw/functions/fnc_compatibleMagazines.sqf 2024-02-07 09:18:35 -08:00
johnb432
c94d29c88b Merge branch 'master' into pr/9234 2024-02-07 18:05:21 +01: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
8ca5263f18
Common - Make FUNC(isModLoaded) case-insensitive (#9704)
* Update fnc_isModLoaded.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update fnc_isModLoaded.sqf

---------

Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-12-31 17:45:01 -08:00
johnb432
a4661f3280 Minor cleanup 2023-12-23 10:50:56 +01:00
johnb432
da210890ac Small cleanup and tweaks 2023-12-22 23:03:33 +01:00
johnb432
301489bc58 Update fnc_canGetIn.sqf 2023-12-18 18:01:21 +01:00
johnb432
a5b0490ee2 Various fixes 2023-12-18 17:47:01 +01:00
johnb432
5e2ffb9701
Update addons/csw/functions/fnc_assemble_canPickupWeapon.sqf 2023-12-18 06:56:01 -08:00
johnb432
1a876afe37 Merge branch 'master' into pr/9234 2023-12-17 23:13:59 +01:00
Grim
3f61a41be3
Common/CSW - Use status effect for enableWeaponDisassembly (#9413)
* uuse weaponDisassemblyEnabled

* convert to status effect

* fix edge conditions

* Update addons/common/functions/fnc_claim.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/common/XEH_postInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/common/XEH_postInit.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update XEH_postInit.sqf

* Update addons/common/functions/fnc_claimSafeServer.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update fnc_claimSafeServer.sqf

* change status effect key

* status effect key

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-11-22 21:16:42 -03:00
PabstMirror
d70c049b4f
CSW/Dragging - Handle null objects causing script errors (#9529)
* CSW - Handle static weapon be deleted

* add same fix to dragging
2023-10-18 22:17:07 -04:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Grim
55cc755542
CSW - Disable non-CSW rearm actions for CSW vehicles (#9255)
* improve CSW integration

* do this more cleanly

* code style

* revert ammo handling check change
2023-08-18 13:10:15 -04:00
Bailey Danyluk
ef23310aec
Docs - Change name (again) (#9328) 2023-08-16 19:18:01 -04:00
Salluci
b51efb15fc add support for getting vehicle magazine from magwells 2023-07-24 00:34:51 +03:00
Salluci
3c767c6025 skip magazines with no ammo 2023-07-16 21:43:43 +03:00
Salluci
1cf254a752 fix condition 2023-07-14 19:36:40 +03:00
Salluci
2b52fee1bf fix container creation 2023-07-14 19:27:13 +03:00
Salluci
fac2e6151a add example to header 2023-07-14 19:21:04 +03:00
Salluci
b7abfeaeb5 add ai_switchMagazine 2023-07-14 19:04:42 +03:00
Salluci
22d45be421 function header 2023-07-14 18:43:19 +03:00
Salluci
18187621d3 i should squash these 2023-07-14 00:59:50 +03:00
Salluci
bb9ac714ce fix derp part 2 2023-07-14 00:48:14 +03:00
Salluci
ef93a61e13 fix derp 2023-07-14 00:37:27 +03:00
Salluci
87586459bc fix stupid, add turretPath bool 2023-07-14 00:12:18 +03:00
Salluci
4e8c69e08a make public 2023-07-13 20:01:33 +03:00
Salluci
7647123683 add forcedMag and ai_unloadMagazines 2023-07-13 19:53:57 +03:00
Salluci
73bc331701 function header 2023-07-13 19:52:56 +03:00
Salluci
078857b5a9 add getAvailableAmmo 2023-07-13 14:51:26 +03:00
Salluci
17156d5480 missing semicolon 2023-07-13 13:56:40 +03:00
Salluci
e5a9fadcec add check for invalid proxyWeapon 2023-07-13 13:53:50 +03:00
Salluci
4b92ef2ade remove systemChat 2023-07-13 13:48:11 +03:00
Salluci
aa8fff3041 fix case sensitivy, move container creation 2023-07-13 13:45:52 +03:00
Salluci
ed44c0d445 more headers 2023-07-13 13:20:21 +03:00
Salluci
6c2a8a2117 add container property 2023-07-13 13:16:15 +03:00
Salluci
c46dc339c5 _staticWeapon > _vehicle, StaticWeapon > CSW 2023-07-13 13:01:28 +03:00
Salluci
c96a9daf7b remove unnecessary change 2023-07-13 10:50:06 +03:00
Salluci
d00c9ca2a0 all the things 2023-07-13 10:42:30 +03:00
Salluci
5d62ab4125 fix undefined variable 2023-07-02 19:48:01 +03:00