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

Optics - Convert Optics to use CBA Optics #7273

Merged
merged 23 commits into from
Aug 15, 2024
Merged

Optics - Convert Optics to use CBA Optics #7273

merged 23 commits into from
Aug 15, 2024

Commits on Nov 17, 2019

  1. convert ace_optics to use cba_optics

    @commy2
    commy2 committed Nov 17, 2019
    Configuration menu
    Copy the full SHA
    8360cc1 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2019

  1. convert ace optics to cba optics

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

Commits on Jul 25, 2024

  1. Merge branch 'master' into cba-scripted-optics

    @johnb432
    johnb432 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    9d4e2ae View commit details
    Browse the repository at this point in the history

  2. Remove duplicate

    @johnb432
    johnb432 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    ef536b2 View commit details
    Browse the repository at this point in the history

  3. Add PIP config

    @johnb432
    johnb432 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    6cffdf5 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. Use optics index

    @johnb432
    johnb432 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    7d785b2 View commit details
    Browse the repository at this point in the history

  2. Fix pboProject build

    @johnb432
    johnb432 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    643c0d7 View commit details
    Browse the repository at this point in the history

  3. Update CfgWeapons.hpp

    @johnb432
    johnb432 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    077e86f View commit details
    Browse the repository at this point in the history

  4. Correct SOS, adjust sizes and fix build issues

    @johnb432
    johnb432 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d836695 View commit details
    Browse the repository at this point in the history

  5. Update addons/optics/script_component.hpp

    @PabstMirror
    PabstMirror authored Jul 26, 2024
    Configuration menu
    Copy the full SHA
    066ef45 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. Corrected sizes again

    @johnb432
    johnb432 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    c046c38 View commit details
    Browse the repository at this point in the history

  2. Made the scripted optics the first optics mode, fixed PIP SOS not bei… 

    …ng able to use irons
    @johnb432
    johnb432 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    c08aca0 View commit details
    Browse the repository at this point in the history

  3. Remove unused test object

    @johnb432
    johnb432 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    c7ef1ca View commit details
    Browse the repository at this point in the history

  4. Readd AI stuff 

    visionMode is already set
    @johnb432
    johnb432 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    aa355cc View commit details
    Browse the repository at this point in the history

  5. Updated some info on binos 

    forceOptics also already set
    @johnb432
    johnb432 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    4e30276 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Overhaul of magnifications

    @johnb432
    johnb432 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    5df2a2b View commit details
    Browse the repository at this point in the history

  2. Adjusted MOS & Nightforce

    @johnb432
    johnb432 committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    87431fd View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Merge branch 'master' into cba-scripted-optics

    @johnb432
    johnb432 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    56a45f9 View commit details
    Browse the repository at this point in the history

  2. Maybe this time the optics sizes will be fine... surely?

    @johnb432
    johnb432 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    d3aa02b View commit details
    Browse the repository at this point in the history

  3. Replace heavy optics blur with CBA one

    @johnb432
    johnb432 committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    81c1f31 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Merge branch 'master' into cba-scripted-optics

    @johnb432
    johnb432 committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5d44a94 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. Added PIP names back

    @johnb432
    johnb432 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    95ec937 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into cba-scripted-optics

    @johnb432
    johnb432 committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    8eb732e View commit details
    Browse the repository at this point in the history