Commit Graph

10179 Commits

Author SHA1 Message Date
Josuan Albin
4792e74b2b Explosives - Change SLAM magnetic to detonate upon defusal (#6827)
* Change SLAM magnetic to detonate upon defusal

* Disable explodeOnDefuseChance on SLAM timer mode
2019-02-24 14:18:01 -06:00
PabstMirror
c423e2167c
Zeus - fix script error (#6833) 2019-02-24 14:03:54 -06:00
Dedmen Miller
48f45ae27a Move SelfActions from postInit to config (#6791)
* Move zeus SelfActions to config

* Port CBA PR #1048

* Move Land_Camping_Light_off_F TurnOn action to config

* Move createModule function to script func

* Update addons/zeus/functions/fnc_canCreateModule.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Teaching it a lesson about spacing

* Update CBA: script_macros_common.hpp

* Just change admin in cba macro
2019-02-24 13:36:50 -06:00
PiZZAD0X
9e609b3394 Arsenal - Add Ability to Transfer a Loadout from Saved to Default (#6793)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Added ability to export loadout to defaultloadouts

Shift + LMB on save button can export the selected saved loadout to the mission loadouts. Experimental Test. Warrants a separate button if there is enough demand.

* Update fnc_buttonLoadoutsSave.sqf

* Update addons/arsenal/functions/fnc_buttonLoadoutsSave.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Add usage info to tooltip
2019-02-23 19:35:13 -06:00
PabstMirror
ec840a793d
Cargo - Add condition checking durring load/unload (#6821) 2019-02-22 18:54:55 -06:00
PabstMirror
860fa0fcfa
Repair - Add condition check to progressBar (#6830) 2019-02-22 18:54:25 -06:00
PabstMirror
3ee3c5de5a
Interact Menu - Cache config actions for CAManBase (#6818)
* Interact Menu - Cache config actions for CaManBase

* Update addons/interact_menu/functions/fnc_compileMenu.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/interact_menu/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-02-22 18:54:07 -06:00
PabstMirror
191c4fb694
Disable debug on ace_common_fnc_readSettingsFromParamsArray (#6820) 2019-02-17 12:58:07 -06:00
Dedmen Miller
0c8c924487 Minedetector - Cache detectableClasses (#6805)
* Cache minedetector detectableClasses

* use compileFinal
2019-02-17 12:31:34 -06:00
Dedmen Miller
21fd4e5d16 Inventory - Cache inventory postInit config lookups (#6803)
* Cache inventory postInit config lookups

* Safety

* fix

* More better

* ugh

* add parenthesii (not trolling)

these are actually needed
```
Error in expression <_inventory_Grenades_ItemList", []];
if (!ace_inventory_Grenades_ItemList isEqual>
  Error position: <!ace_inventory_Grenades_ItemList isEqual>
  Error !: Type Array, expected Bool
```

* Add space
2019-02-17 11:41:48 -06:00
Dedmen Miller
7cce148513 Tagging - Cache tagging static models (#6804)
* Cache tagging static models

* Fix bugs, use compileFinal

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Use toLower
2019-02-17 11:41:25 -06:00
Dedmen Miller
af1cf2c7f6 Cargo - Cache cargo vehicle classes (#6806)
* Cache cargo vehicle classes to init

* fix

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix initEH being added twice for static weapons
2019-02-17 11:41:05 -06:00
Dedmen Miller
25d847ef12 Refuel - Cache refuel classes (#6807)
* Cache refuel classes

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>

* Fix script errors from inner _x
2019-02-16 17:05:24 -06:00
commy2
deb7177171
Merge pull request #6815 from acemod/callCompileCleanup
Cleanup spacing on call COMPILE_FILE
2019-02-14 21:22:29 +01:00
Dedmen Miller
598738c22f Common - Use CBA addons instead of activatedAddons (#6802)
* Use CBA addons instead of activatedAddons

* Better checks

* Betterest checks

* Delay call to toLower until needed

* Apply suggestions from code review

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
2019-02-14 12:49:56 -06:00
PabstMirror
01eabdb1df Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
PabstMirror
afd957f1e7
HuntIR - Move magwell compat to huntIR config (#6813) 2019-02-13 12:39:10 -06:00
PabstMirror
1abe622e28
Pylons - Remove ace_zeus from requiredAddons (#6808) 2019-02-11 14:19:19 -06:00
commy2
30ecfb0a71
Merge pull request #6800 from acemod/cbaAddons
Common - checkfiles use cba's list of CfgPatches
2019-02-09 14:10:10 +01:00
commy2
435ad69835
Merge pull request #6801 from acemod/100Rnd-mags-for-MXSW
add 100Rnd mags magwell to all MX variants
2019-02-09 14:09:47 +01:00
commy2
b9b45cd609 add 100Rnd mags magwell to all MX variants 2019-02-09 11:41:05 +01:00
PabstMirror
af3b8ec7fc Common - checkfiles use cba's list of CfgPatches 2019-02-08 16:39:57 -06:00
commy2
dc45072010
Merge pull request #6799 from dedmen/minedetectorPreStart
Compile minedetector scripts at preStart
2019-02-08 18:02:37 +01:00
Dedmen Miller
c9dc84d170 Compile minedetector scripts at preStart 2019-02-08 14:55:06 +01:00
mharis001
fa101d859a Pylons - Update configure pylons action (#6381) 2019-02-07 17:12:48 -06:00
PabstMirror
ff5eb34e10
Interaction Menu - Only compile self actions when needed (#6792)
* Interaction Menu - Only compile self actions when needed

* Update XEH_clientInit.sqf

* fix spellling

* format/comments

* Don't compile actions on headless servers

* Update addons/zeus/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-31 19:25:16 -06:00
Brandon Danyluk
639d3fdfa1 cfgSkeletons indentation formatting fixes (#6796)
* abc

* Revert "abc"

This reverts commit bcb4214bd9.

* Update to current commit

* Fix class OFP2_ManSkeleton to have proper indentation for all bones

* Fix path. Fix whitespace
2019-01-31 19:22:33 -06:00
PabstMirror
d379c3f1b7
MissileGuidance - Allow using vanilla fire mode key (#6732)
* MissileGuidance - Allow using vanilla fire mode key

Fix #6595

* Javelin - Backwards compatiblity with CUP

* Add support to RHS compat

* comment
2019-01-30 22:11:01 -06: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
32ffe3243c
Zeus - Paradrop Cargo (#6743)
* Zeus - Paradrop Cargo Waypoint

* move script component

* cfgpatches, localize, fix getModuleDestination call

* cleanup debug
2019-01-30 18:30:42 -06:00
Josuan Albin
8450555f0c Arsenal - Fix arsenal not working reliably on remote AI units. (#6784)
* Fix 6701

* Update addons/arsenal/functions/fnc_onArsenalClose.sqf

Co-Authored-By: alganthe <alganthe@live.fr>
2019-01-26 14:13:38 -06:00
PabstMirror
3df805306b
Arsenal - Fix script stat script errors for odd weapons (#6794) 2019-01-26 14:13:19 -06:00
commy2
547dfff683 Common - optimize toHex (#6788)
* optimize toHex

* Use predefined hex array in preInit
2019-01-26 11:01:41 -06:00
chaot3ch
5f4dd9de5e Fixed Typo from change to chance (#6789)
Change to change change into chance
2019-01-24 20:20:49 +01:00
PiZZAD0X
13193d3e6d Dragging - Additional weight override parameter for setCarryable/setDraggable (#6780)
* Added weight override parameter to ace_dragging_fnc_setCarryable/setDraggable

- Additional optional parameter that ignores the `startCarry`/`startDrag` weight checks.
- Minor `==` to `isEqualto` replacements

* `count crew _target isEqualto -1` to `count crew _target isEqualto 0`

* Tab Replacement

- remove \t

* Reverted UAV check, Params formatting, Lazy Eval

* Update addons/dragging/functions/fnc_startCarry.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>

* Update fnc_startDrag.sqf

* Remove beta suggestion extra line additions

* Update addons/dragging/functions/fnc_startDrag.sqf

Co-Authored-By: PiZZAD0X <509thparachuteinfantry@gmail.com>
2019-01-20 10:23:24 -06:00
mharis001
c4655148e0 Add apex goggles entries (#6778) 2019-01-16 09:40:46 -06:00
madpat3
f6c4ec5f09 Wirecutters - Add compatibility with more fences from CUP (#6777)
and another one
2019-01-15 20:16:12 -06:00
PabstMirror
2f3fd06fcf
Medical - Fix stringtable (#6774) 2019-01-14 11:41:29 -06:00
pokertour
4a5b5113cd FastRoping - Add rope items which deploy at lengths (#6498)
* Update stringtable.xml

* Update config.cpp

* New CFGWeapon

* Update CfgVehicles.hpp

* Update fnc_deployRopes.sqf

* Update CfgVehicles.hpp

* Update CfgWeapons.hpp

* Update CfgVehicles.hpp

cheapest check before others

* Update fnc_deployRopes.sqf

Corrected the double remove.

* Cleanup PR

Add setting, move rope len to config, simplify strings, add rope image, fix rope unwind length

* Add setting name to stringtable

* Update stringtable.xml

French translation for settings
2019-01-11 21:05:25 -06:00
PabstMirror
188aabe699
Medical - Add new setting to hide self-interaction actions (#6756)
* Medical - Hide self interaction menu if disabled

* Add new setting
2019-01-11 20:58:13 -06:00
PabstMirror
59aa38185a
Dragging - Fix player getting locked with isCarrying (#6770) 2019-01-07 09:45:48 -06:00
Jo David
73386c5391
remove the only entry of "Original" and replace it by "English" (#6766) 2019-01-04 08:42:46 +01:00
Cyruz143
a18f4180ac Medical - Adding option to convert vanilla medical gear (#6680)
* Adding option to convert vanilla medical gear

* Better wording on setting description

* Shortern var names

* Shorter settings title

* 3 options (enabled, just remove, disabled)
2019-01-03 14:26:22 -06:00
McDiod
fcfe278f7f markers - add setting allowing only marker creator to move (#6734)
* markers - add setting allowing only marker creator to move

* shorten setting display names

* delete some whitespace, superfluous command

* single arg needs no array

* delete some whitespace

* don't save directPlayID default value

* Save array of user placed markers
2019-01-03 13:31:21 -06:00
PabstMirror
f57d5ac180
Medical - Skip distance check if in same vehicle (#6757)
* Medical - Skip distance check if in same vehicle

* Update addons/medical/functions/fnc_displayPatientInformation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-02 09:56:26 -06:00
PabstMirror
da0ab4617a
WeaponSelect - Fix putWeaponAway animation (#6758) 2019-01-02 09:56:07 -06:00
PabstMirror
f4f67e262d
Medical - Add vehicle hint when loading unconc (#6759) 2019-01-02 09:55:25 -06:00
PabstMirror
6d8cdd9b1d
Interaction - Disable open door action on houses with no user actions (#6760)
Fix #6544
2019-01-02 09:55:03 -06:00
PabstMirror
e32bcb1f9a Arsenal - Adjust macros for newest pboProject 2019-01-01 12:04:43 -06:00