Update from original #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…BA_A3 into release-candidate-3-10
* Update Japanese translation * Update Japanese translation * Update Japanese translation * Update Japanese translation
* preload 3den ammo box item list * preload ćurator ammo box item list, wip * preload zeus ammo box item list * curator preload test * preload curator ammo box item list * preload curator ammo box item list * preload curator ammo box item list * preload curator ammo box item list * optimize * prevent an indent * move preload functions away from preStart * log * optimize bigly * travis * travis * delete namespaces after use
* Update DIK Codes define path Updated path, used in ACE3 everywhere and in CBA mostly. * Update fnc_add.sqf * Update script_component.hpp * Update fnc_addKeybind.sqf
* fix error popup in Arsenal Garage * auto update version number
Default installed on Travis CI, will speed up builds a bit.
* Add trigger options to weapon events * Fix trigger not being set for next PFH run * Set default weapon event to trigger release * Fix and GVAR weapon event options * Fix weapon event options * Use cba_settings_fnc_init directly instead of from unprepared cache * Update addons/events/initSettings.sqf * German translations and UI text changes
* add 2d optics component * assets * port some functions * add component to main requiredAddons, fix currentOptic for null * port CBA_fnc_restartCamera, some macros * port updateOpticInfo, global variable names, setting * punctuation * some global variables * loadScriptedOptic and animateScriptedOptic functions * work on changePIP/CarryHandleOpticClass functions * work on changePIP/CarryHandleOpticClass functions * fix bugs * Update addons/2doptics/reticles/pip.rvmat Co-Authored-By: commy2 <commy-2@gmx.de> * fix a function description * move stuff to ace * Thanks Travis * optimize, don't create camera if pip disabled * optimize * delete empty file * new configs * multiple carry handle types support * fix a classname in config * shortened classnames * delete unused macros * fix a bug * add dummy classes to force magnification * 2D Optics polish translation (#1113) * setOpticMagnification function * fix various bugs and quirks * restore optic magnification after optic mode toggle wip * restore magnification and zeroing * pip support for launchers and pistols * restore magnification for pistol and launcher optics * spelling "collimator" * cache zeroing distances array on optic switch * add support for scripted optics mode pp effects * fix flickering of current zeroing in ui when switching modes * delete dead code
* rename 2doptics to optics * rename 2doptics to optics
* Add Italian Translation * Typo * Fix tags removed by Tabler
* compatibleMagazines - Add optional bool to get all muzzles * Apply suggestions from code review Co-Authored-By: PabstMirror <pabstmirror@gmail.com> * fix github code review messing up
* add disposable launcher framework * fix and simplify launcher dummy magazine * rename 2doptics to optics * rename 2doptics to optics * add disposable component * disposable arsenal handling * fix a bug * replace with used launcher script * auto drop launcher * disable secondary weapon magazine slot for disposable launchers * disable secondary weapon magazine slot for disposable launchers * fix a thing, delete unused * fix addWeapon leeching magazines * simplify setUnitLoadout * cba_optics_fnc_addWeapon * cba_optics_fnc_addWeapon * optimize and keep weapon mode when toggling to pip / normal weapon with optic * report mags of all muzzles * replace loaded launcher mags with loaded launchers * add shared function CBA_fnc_addWeaponWithoutMagazines * add shared function CBA_fnc_addWeaponWithoutItems * add launcher mags and attachments to dropped container * handle prequipped backpacks * handle prequipped backpacks stored themselves in cargo * handle prequipped backpacks stored themselves in cargo * drop used launcher setting * handle Arsenal * fix a problem with backpacks * support for vehicle optics * global to disable mag replacement
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When merged this pull request will: