Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Scripted 2D optics component #1105

Merged
merged 42 commits into from
Apr 13, 2019
Merged

Scripted 2D optics component #1105

merged 42 commits into from
Apr 13, 2019

Commits on Mar 30, 2019

  1. add 2d optics component

    @commy2
    commy2 committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    55170f6 View commit details
    Browse the repository at this point in the history

  2. assets

    @commy2
    commy2 committed Mar 30, 2019
    Configuration menu
    Copy the full SHA
    f0f9629 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2019

  1. port some functions

    @commy2
    commy2 committed Mar 31, 2019
    Configuration menu
    Copy the full SHA
    02129b2 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2019

  1. add component to main requiredAddons, fix currentOptic for null

    @commy2
    commy2 committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    99e2f9b View commit details
    Browse the repository at this point in the history

  2. port CBA_fnc_restartCamera, some macros

    @commy2
    commy2 committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    5997a9c View commit details
    Browse the repository at this point in the history

  3. port updateOpticInfo, global variable names, setting

    @commy2
    commy2 committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    c67b6a8 View commit details
    Browse the repository at this point in the history

  4. punctuation

    @commy2
    commy2 committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    e19ca59 View commit details
    Browse the repository at this point in the history

  5. some global variables

    @commy2
    commy2 committed Apr 1, 2019
    Configuration menu
    Copy the full SHA
    1c6fd86 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2019

  1. loadScriptedOptic and animateScriptedOptic functions

    @commy2
    commy2 committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    ce40420 View commit details
    Browse the repository at this point in the history

  2. work on changePIP/CarryHandleOpticClass functions

    @commy2
    commy2 committed Apr 2, 2019
    Configuration menu
    Copy the full SHA
    529755a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2019

  1. work on changePIP/CarryHandleOpticClass functions

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    e2a2b84 View commit details
    Browse the repository at this point in the history

  2. fix bugs

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    e33ba6e View commit details
    Browse the repository at this point in the history

  3. Update addons/2doptics/reticles/pip.rvmat 

    Co-Authored-By: commy2 <commy-2@gmx.de>
    @dedmen @commy2
    dedmen and commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    6090a6e View commit details
    Browse the repository at this point in the history

  4. fix a function description

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    d3b7b60 View commit details
    Browse the repository at this point in the history

  5. move stuff to ace

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    f7bbe43 View commit details
    Browse the repository at this point in the history

  6. Thanks Travis

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    9a598d1 View commit details
    Browse the repository at this point in the history

  7. optimize, don't create camera if pip disabled

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    287ff93 View commit details
    Browse the repository at this point in the history

  8. optimize

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    4ad92d1 View commit details
    Browse the repository at this point in the history

  9. delete empty file

    @commy2
    commy2 committed Apr 3, 2019
    Configuration menu
    Copy the full SHA
    4ceb9a1 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2019

  1. new configs

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    bbe75f1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into scripted_optics_component

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    fd7921b View commit details
    Browse the repository at this point in the history

  3. multiple carry handle types support

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    d763fac View commit details
    Browse the repository at this point in the history

  4. manual merge

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    80df2d2 View commit details
    Browse the repository at this point in the history

  5. fix a classname in config

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    26a4887 View commit details
    Browse the repository at this point in the history

  6. shortened classnames

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    e098697 View commit details
    Browse the repository at this point in the history

  7. delete unused macros

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    1e1272f View commit details
    Browse the repository at this point in the history

  8. fix a bug

    @commy2
    commy2 committed Apr 5, 2019
    Configuration menu
    Copy the full SHA
    4259970 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2019

  1. add dummy classes to force magnification

    @commy2
    commy2 committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    3343240 View commit details
    Browse the repository at this point in the history

  2. 2D Optics polish translation (#1113)

    @veteran29 @commy2
    veteran29 authored and commy2 committed Apr 7, 2019
    Configuration menu
    Copy the full SHA
    c113243 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2019

  1. setOpticMagnification function

    @commy2
    commy2 committed Apr 8, 2019
    Configuration menu
    Copy the full SHA
    42f546f View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2019

  1. fix various bugs and quirks

    @commy2
    commy2 committed Apr 10, 2019
    Configuration menu
    Copy the full SHA
    9e87f1f View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2019

  1. restore optic magnification after optic mode toggle wip

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    9d7d038 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin' into scripted_optics_component

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    6b90efc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'scripted_optics_component' of https://github.com/CBATea… 

    …m/CBA_A3 into scripted_optics_component
    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    bd94e36 View commit details
    Browse the repository at this point in the history

  4. restore magnification and zeroing

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    13f57fe View commit details
    Browse the repository at this point in the history

  5. pip support for launchers and pistols

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    2749274 View commit details
    Browse the repository at this point in the history

  6. restore magnification for pistol and launcher optics

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    8c8d7b8 View commit details
    Browse the repository at this point in the history

  7. spelling "collimator"

    @commy2
    commy2 committed Apr 12, 2019
    Configuration menu
    Copy the full SHA
    20f0db4 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2019

  1. cache zeroing distances array on optic switch

    @commy2
    commy2 committed Apr 13, 2019
    Configuration menu
    Copy the full SHA
    032e7e0 View commit details
    Browse the repository at this point in the history

  2. add support for scripted optics mode pp effects

    @commy2
    commy2 committed Apr 13, 2019
    Configuration menu
    Copy the full SHA
    c6b50cc View commit details
    Browse the repository at this point in the history

  3. fix flickering of current zeroing in ui when switching modes

    @commy2
    commy2 committed Apr 13, 2019
    Configuration menu
    Copy the full SHA
    1623f77 View commit details
    Browse the repository at this point in the history

  4. delete dead code

    @commy2
    commy2 committed Apr 13, 2019
    Configuration menu
    Copy the full SHA
    04be06a View commit details
    Browse the repository at this point in the history