jonpas
742626ff1a
General - Relative script_component.hpp includes ( #9378 )
...
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
PabstMirror
8c5ab18350
Various - Misc Cleanup ( #9317 )
...
* Various - Misc Cleanup
* Update addons/common/functions/fnc_canDig.sqf
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
---------
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
2023-08-13 14:13:02 -05:00
Dystopian
0321545098
Rearm - Add enable setting ( #8067 )
...
* Add enable setting
* Update test
* Optimize eden macro
* Fix bad command name in eden
* Apply suggestions from code review
Co-authored-by: jonpas <jonpas33@gmail.com>
* Cleanup unused argument
* Handle RHS config
* Optimize init function a little
* Improve macro
Co-authored-by: jonpas <jonpas33@gmail.com>
* compats and leftovers
* function header (sorry jonpas)
* add enabled check to initSupplyVehicle
* use toString
* fix validate
* inheritance cleanup
---------
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2023-07-28 12:47:23 +03:00
jonpas
48a4e9682c
Forbit use of (optional) in function headers, always require a value
2023-05-01 17:33:07 +02:00
jonpas
76e1aafb33
Use function documentation script ( #6897 )
...
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
TACHarsis
1693e6834d
Added ace_rearm_sourceInitialized event ( #9134 )
2023-02-17 20:59:23 -06:00
Dystopian
9569a16efc
Fix rearm of dead vehicles ( #8962 )
2022-07-10 09:47:47 +01:00
GhostIsSpooky
68ed19911a
General - Change object config lookups to configOf ( #8795 )
...
* configOf lookups
* forEach, missed configOf
* revert handcuff distance change
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* optimize condition
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* capitalization
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* use object in getVehicleIcon
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* add return comment
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* remove extra brackets
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* add missing brackets
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* add return comment pt2
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
* revert to cursorTarget
Co-authored-by: Filip Maciejewski <veteran29@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2022-03-08 21:41:21 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace ( #8651 )
2021-10-30 16:42:03 -05:00
Drofseh
40ec4e9137
Update fnc_getNeedRearmMagazines.sqf ( #8456 )
2021-10-12 16:08:06 -05:00
Yannis Li
0e043e5fb7
fix: change conditional so a magazine is added to turret when array is not modified ( #8287 )
...
Co-authored-by: Yannis Li <yannis@trybe.ly>
2021-07-24 00:20:17 -05:00
Neviothr
75f7ed7532
Utilize isNotEqualTo ( #7929 )
...
* Utilize isNotEqualTo
* undo changes to some files
* redo some changes, fix based on @Vdauphin 's comment
* fix validator issues
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-27 11:05:05 -06:00
mharis001
5bc43fe247
Common - Improve getPylonTurret by using getAllPylonsInfo ( #8087 )
...
* Improve getPylonTurret by using getAllPylonsInfo
* Fix indentation
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2021-02-23 10:57:57 -06:00
PabstMirror
e8693c8db9
Various - Use configOf command for faster lookup ( #8100 )
...
* configOf
* replace some use of CBA_fnc_getObjectConfig
2021-02-18 12:58:08 -06:00
Rutger "RedBery" Meijering
7da977a4e3
Fixes some magazines not being found leading to duplication ( #7760 )
2020-06-15 09:52:14 -05:00
Rutger "RedBery" Meijering
1f20047410
Rearm - Fix vehicles failing rearm due to case differences ( #7609 )
2020-03-20 17:54:30 +01:00
Whigital
22c44629f7
conform isnil checking: rearm
2020-02-12 17:29:04 +01:00
Josuan Albin
1caf6fb08f
Rearm - Add distance setting ( #7137 )
...
* Add rearm distance setting
* Set rearm distance slider maximum at 50m
* Update addons/rearm/stringtable.xml
Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>
* Fix rearm action check
* Update addons/rearm/stringtable.xml
Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>
* Update addons/rearm/initSettings.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Update addons/rearm/functions/fnc_rearm.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-09-03 19:06:50 -05:00
PabstMirror
8763184b6a
CSW/Dragon cleanup and rearm compat ( #7068 )
...
* Dragon work
cleanup
remove unused p3ds
add pos_gunner_dir/pos_gunner to static
add [csw] prefix to arsenal version
add sight interaction icons
* Update fnc_staticWeaponInit_unloadExtraMags.sqf
* ace_rearm compat
allows pulling carry mags out of rearm trucks
* Update fnc_ai_handleFired.sqf
* Re-add 3den attributes
* cleanup and move A2 staticweapon strings to ace_csw
2019-07-05 17:57:22 -05:00
BaerMitUmlaut
229199ba16
Fix rearming for vehicles using magazine wells
2019-05-11 01:23:33 +02:00
Dedmen Miller
d034324e88
More trivial code cleanup ( #6859 )
...
* Added a3 include pboprefix
* Add defineDIKCodes header
* defineDIKCodes include case correct
* Use ui_f dikcodes
* Fix fnc_checkfiles macro and dll condition
* Incorrect macro usage in fnc_getVehiclePos
* Incorrect macro usage in fnc_getVehiclePosComplex
* Add defineResincl ui_f include
* Remove include guard from defineResincl
* Incorrect macro usage in fnc_handleMouseButton
* Incorrect macro usage in fnc_setMarkerJIP
* Semicolon after include
* Add defineResinclDesign ui_f include
* Incorrect macro usage fnc_rearmSuccessLocal
* Incorrect macro usage fnc_rearmSuccessLocal
* Stray backslash in fnc_camshake
* Incorrect macro usage in fnc_startNozzleInHandsPFH
* Incorrect amcro usage in fnc_tag
* Incorrect macro usage in fnc_moduleGlobalSetSkill
* Reenable linux checkFiles
* Non-captialized requiredAddons
* Non-captialized requiredAddons
2019-03-21 08:52:32 -05:00
Dystopian
d804d3afe6
Cleanup some functions headers and macro using ( #6866 )
...
* Cleanup frisking
* Cleanup header format
* Cleanup FUNC macro using
2019-03-20 15:18:43 -05:00
PabstMirror
05d1c62c1f
Rearm - Fix locality issues with setMagazineTurretAmmo ( #6787 )
2019-01-30 18:48:40 -06:00
PabstMirror
6bee6d5cd8
Rearm - Use non-ambigious magazine names ( #6761 )
...
* Rearm - Use non-ambigious magazine names
Close #6414
Also fix missing caliber for B_20mm_AP
* Update fnc_getMagazineName.sqf
2019-01-30 18:31:01 -06:00
PabstMirror
64a06ddb07
Merge pull request #6674 from acemod/pr/6424
...
Rearm - Fix for 3den PR
2018-11-11 15:25:39 -06:00
PabstMirror
d5b3696c02
Fix -1//disabled and JIP issues
2018-11-02 16:56:16 -05:00
Josuan Albin
328853e36b
Fix mk6 mortar being reloadable via rearm when ammoHandling is enabled ( #6648 )
...
Rearm - Fix mk6 mortar being reloadable when ammoHandling is enabled
2018-10-28 16:14:11 -05:00
Dystopian
d7c7ead574
Zeus - Add Repair and Rearm interactions ( #6632 )
...
* Add Repair and Rearm interaction to zeus
* Optimize remoteControl statement
2018-10-13 12:07:32 -05:00
Dedmen Miller
e2ac18a05d
[WIP] Fix script errors reporting wrong line numbers ( #6407 )
...
* advanced_ballistics
* advanced_fatigue
* advanced_throwing
* ai
* aircraft
* arsenal
* atragmx
* attach
* backpacks
* ballistics
* captives
* cargo
* chemlights
* common
* concertina_wire
* cookoff
* dagr
* disarming
* disposable
* dogtags
* dragging
* explosives
* fastroping
* fcs
* finger
* frag
* gestures
* gforces
* goggles
* grenades
* gunbag
* hearing
* hitreactions
* huntir
* interact_menu
* interaction
* inventory
* kestrel4500
* laser
* laserpointer
* logistics_uavbattery
* logistics_wirecutter
* magazinerepack
* map
* map_gestures
* maptools
* markers
* medical
* medical_ai
* medical_blood
* medical_menu
* microdagr
* minedetector
* missileguidance
* missionmodules
* mk6mortar
* modules
* movement
* nametags
* nightvision
* nlaw
* optics
* optionsmenu
* overheating
* overpressure
* parachute
* pylons
* quickmount
* rangecard
* rearm
* recoil
* refuel
* reload
* reloadlaunchers
* repair
* respawn
* safemode
* sandbag
* scopes
* slideshow
* spectator
* spottingscope
* switchunits
* tacticalladder
* tagging
* trenches
* tripod
* ui
* vector
* vehiclelock
* vehicles
* viewdistance
* weaponselect
* weather
* winddeflection
* yardage450
* zeus
* arsenal defines.hpp
* optionals
* DEBUG_MODE_FULL 1
* DEBUG_MODE_FULL 2
* Manual fixes
* Add SQF Validator check for #include after block comment
* explosives fnc_openTimerUI
* fix uniqueItems
2018-09-17 14:19:29 -05:00
Dmitry-Yuri
c33fc6106d
Fix Rearming Pylon Magazines ( #6378 )
...
* Update fnc_keyPress.sqf
* Update fnc_keyPress.sqf
* Update fnc_rearmSuccessLocal.sqf
* Update fnc_rearmSuccessLocal.sqf
2018-07-19 18:40:04 -05:00
Will
4b1672eaa0
its now possible to set rearm vehicles in the editor && pylons now look also for non-config rearm vehicles
2018-07-09 19:20:55 +02:00
PabstMirror
d41779dc74
Fix getAllRearmTurrets ( #6224 )
2018-04-07 20:23:10 -05:00
PabstMirror
7d998acc71
Fix rearm entire vehicle argument order ( #5993 )
2017-12-30 12:46:11 +00:00
SilentSpike
845f3656d4
Remove deprecated functionality for 3.12.0 ( #5878 )
...
* Remove deprecated functionality for 3.12.0
* Remove associated deprecated module icon
* Restore a dummy version of old module
This is just to prevent existing missions from breaking due to a missing
object.
2017-12-10 13:38:32 +00:00
Dystopian
36b61fdb6e
Block adv. throwing when player is busy ( #5534 )
...
* Add throw blocking status effect
* Add concertina_wire and tripod support
* Add launcher in hands support
* Disable effect sending more than once
* Fix EFUNC using, add trace
* Disable vanilla throw blocking
* Improve status handling
* Fix rearm status key
2017-12-07 11:26:21 -06:00
Dedmen Miller
bacb7d069b
Don't recompile XEH EH's before every call ( #5728 )
...
* Fix medical respawn/init
* Medical use CBA addClassEH
* Movement inventoryDisplayLoad
* Medical handleRespawn header typo
* Parachute handleRespawn
* Rearm and parachute handleRespawn
* concertina_wire handleInit
* Fix header
* use XEH function instead of config
* use XEH function instead of config
* remove unneeded init eh
2017-11-07 15:21:58 -06:00
Tim Beswick
c9f1719f5a
Hot Resupply ( #5639 )
...
Allow rearm, refuel and pylons to function while vehicle engine is running
2017-10-25 23:13:44 -05:00
Dedmen Miller
81e02a7336
Refactor private ARRAY to private keyword ( #5598 )
...
* Everything
* Fixed missing ;
* Fix missing ; and double private
* Fixed cannot isNull on number
* Turn _temparture back to isNil
* Fix error from merge
2017-10-10 09:39:59 -05:00
PabstMirror
5f8350d7bc
Minor rearm fixes ( #5572 )
2017-09-30 11:14:41 -05:00
Tuupertunut
0644ad9ca2
Rearm bugfixing ( #5411 )
...
* Added workaround functions for turret magazine ammo.
* Switched to retrieving turrets dynamically instead of looking them up from an array.
* Refactoring only, no functional changes
* Repurposed getNeedRearmMagazines as a general purpose rearm info function + more.
* The function retrieves all non-full magazines. This code was previously repeated in many different functions, but is now centralized in one.
* Empty pylon filling is no longer supported in favor of the upcoming "pylons" ACE-module.
Fixed bugs:
* Rearm was using broken commands "magazineTurretAmmo" and "setMagazineTurretAmmo". They are now replaced with their corresponding workaround functions.
* Pylon rearm was trying to set ammo count on empty pylons.
Note: rearmSuccessLocal is not yet fixed!
* Rearming no longer switches shell types in cannons/mortars.
* Added Tuupertunut to authors.
* Rearming no longer switches shell types. 2nd try.
Last time it was fixed only if the turret is manned. Now it is fixed even when unmanned.
* Updated fnc_rearm to support the earlier repurposing of fnc_getNeedRearmMagazines.
* Small fixes and comments.
* Renamed fnc_getVehicleMagazines to fnc_getTurretConfigMagazines.
The latter describes much better what the function actually does.
* Removed redundant checks.
* Refactoring.
* Fixed spaces in macros.
* Renamed fnc_getAllTurrets to fnc_getAllRearmTurrets
2017-09-29 14:53:25 -05:00
PabstMirror
c28628aed2
Fix rearm turret events ( #5307 )
2017-07-10 17:17:44 +02:00
PabstMirror
f35f80ee82
Rearm - Pylon Support and Dynamically Add Supply Actions ( #5183 )
...
* Dynamic Add
* Support 1.70 Pylon Loadouts
* Properly handle old compat pbos - Update RHS Compat
* Re-add documentation
* cleanup headers (note from other pr)
* Cleanup
* Fix var spelling
2017-06-08 11:47:52 -05:00
PabstMirror
1be9e7ca30
Merge pull request #5182 from acemod/GitHawk-rearm_supply
...
Rearm - Limited Supply (Fix Merge Conflcits)
2017-06-08 11:45:12 -05:00
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
PabstMirror
b192be0b70
Fix merge, cbaEvents, macros, cleanup
2017-05-18 12:42:02 -05:00
PabstMirror
46c041e6bc
Merge branch 'rearm_supply' of https://github.com/GitHawk/ACE3 into GitHawk-rearm_supply
...
Conflicts:
addons/attach/functions/fnc_getChildrenAttachActions.sqf
addons/common/functions/fnc_dumpArray.sqf
addons/common/functions/fnc_removeAllEventHandlers.sqf
addons/common/functions/fnc_removeEventHandler.sqf
addons/common/functions/fnc_serverEvent.sqf
addons/common/functions/fnc_waitUntilAndExecute.sqf
addons/explosives/functions/fnc_scriptedExplosive.sqf
addons/finger/config.cpp
addons/frag/config.cpp
addons/interact_menu/functions/fnc_handlePlayerChanged.sqf
addons/laser/functions/fnc_laserOn.sqf
addons/laser/functions/fnc_seekerFindLaserSpot.sqf
addons/laser/functions/fnc_unitTurretCanLockLaser.sqf
addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf
addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf
addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf
addons/main/config.cpp
addons/main/script_mod.hpp
addons/map/functions/fnc_flashlightGlow.sqf
addons/maptools/functions/fnc_addLineMarker.sqf
addons/maptools/functions/fnc_canDraw.sqf
addons/maptools/functions/fnc_cancelDrawing.sqf
addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf
addons/maptools/functions/fnc_copyMapRemoteSend.sqf
addons/maptools/functions/fnc_copyMapStart.sqf
addons/maptools/functions/fnc_handleKeyDown.sqf
addons/maptools/functions/fnc_handleMouseZChanged.sqf
addons/maptools/functions/fnc_removeLineMarker.sqf
addons/maptools/functions/fnc_updateLineMarker.sqf
addons/missileguidance/functions/fnc_checkLos.sqf
addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
addons/overheating/CfgWeapons.hpp
addons/overheating/functions/fnc_swapBarrelCallback.sqf
addons/rearm/XEH_postInit.sqf
addons/rearm/XEH_respawn.sqf
addons/rearm/functions/fnc_canRearm.sqf
addons/rearm/functions/fnc_dropAmmo.sqf
addons/rearm/functions/fnc_getMaxMagazines.sqf
addons/rearm/functions/fnc_grabAmmo.sqf
addons/rearm/functions/fnc_pickUpAmmo.sqf
addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf
addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf
addons/rearm/functions/fnc_rearmSuccess.sqf
addons/rearm/functions/fnc_rearmSuccessLocal.sqf
addons/rearm/functions/fnc_storeAmmo.sqf
addons/repair/functions/fnc_useItem.sqf
addons/tagging/CfgVehicles.hpp
addons/ui/ACE_UI.hpp
optionals/tracers/config.cpp
2017-05-17 18:21:11 -05:00
PabstMirror
f69148bdc0
Disable rearm,refuel on dead vehicles ( #5158 )
2017-05-13 17:36:53 -05:00
PabstMirror
3ce0865913
Add getInteractionDistance and fix VTOL refuel/arm ( #4882 )
2017-02-10 12:34:51 -06:00
Glowbal
b489750d5b
Minor optimizations using private, params, and isEqualType ( #4323 )
...
* Optimizations with private, params, and isEqualType
* Fixed tab being used instead of space
* Fixed tabs inserted by notepad++
* More usage of new private syntax and params
- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax
* clean up and formatting
2016-09-04 16:44:22 +02:00
Glowbal
4251831e2e
Merge pull request #4009 from acemod/fixRearmEvents
...
Fix rearm events
2016-06-28 20:33:56 +02:00
