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

New UPP guns #3865

Merged
merged 39 commits into from
Aug 25, 2023
Merged

New UPP guns #3865

merged 39 commits into from
Aug 25, 2023

Commits on Apr 18, 2023

  1. init

    @CapCamIII
    CapCamIII committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    f79f5f4 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2023

  1. stuff

    @CapCamIII
    CapCamIII committed May 30, 2023
    Configuration menu
    Copy the full SHA
    8c593c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. i have no idea why i have to commit this but i cant switch branches w… 

    …ithout committing it
    @CapCamIII
    CapCamIII committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    e87fcfc View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. 1

    @CapCamIII
    CapCamIII committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    2c8bdb0 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2023

  1. war

    @CapCamIII
    CapCamIII committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    2adae9e View commit details
    Browse the repository at this point in the history

  2. hell

    @CapCamIII
    CapCamIII committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    79db43a View commit details
    Browse the repository at this point in the history

  3. hell

    @CapCamIII
    CapCamIII committed Jun 18, 2023
    Configuration menu
    Copy the full SHA
    353456d View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    cda2d58 View commit details
    Browse the repository at this point in the history

  2. why is attachment sprite code so confusing

    @CapCamIII
    CapCamIII committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6c84ea7 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

    @CapCamIII
    CapCamIII committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    6811424 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. fuck it this is now also a REBALANCE PR

    @CapCamIII
    CapCamIII committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    4185405 View commit details
    Browse the repository at this point in the history

  2. my idea at last

    @CapCamIII
    CapCamIII committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    0bd6548 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. confusing

    @CapCamIII
    CapCamIII committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    cc58f21 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    513b048 View commit details
    Browse the repository at this point in the history

  2. vgh

    @CapCamIII
    CapCamIII committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    11956f0 View commit details
    Browse the repository at this point in the history

  3. checks suck why cant we just merge broken code

    @CapCamIII
    CapCamIII committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    ce96bf0 View commit details
    Browse the repository at this point in the history

  4. abcdefghijklmnopqrstuvwxyz

    @CapCamIII
    CapCamIII committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    bf31a94 View commit details
    Browse the repository at this point in the history

  5. Hellish

    @CapCamIII
    CapCamIII committed Jul 11, 2023
    Configuration menu
    Copy the full SHA
    40ed7d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. whoever decided to replace the actual error sprites with clown masks … 

    …giving me a conflict 🖕
    @CapCamIII
    CapCamIII committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    2944eab View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    5b291eb View commit details
    Browse the repository at this point in the history

  3. misinput

    @CapCamIII
    CapCamIII committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    deb88a3 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    e49d90d View commit details
    Browse the repository at this point in the history

  2. i hate conflicts aaaaaaaa

    @CapCamIII
    CapCamIII committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    13af81b View commit details
    Browse the repository at this point in the history

  3. why did there have to be a refractor to full auto which forgets the m… 

    …echanics of fullauto ramp-up that all FAs were balanced on i swear to god
    @CapCamIII
    CapCamIII committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    cf2ff8d View commit details
    Browse the repository at this point in the history

  4. since when do duplicate file states fail linters 🖕

    @CapCamIII
    CapCamIII committed Jul 26, 2023
    Configuration menu
    Copy the full SHA
    3612f31 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    3d5ad6c View commit details
    Browse the repository at this point in the history

  2. rage

    @CapCamIII
    CapCamIII committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    cfcf5ab View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    8ebffc1 View commit details
    Browse the repository at this point in the history

  2. give it up for MERGE CONFLICT NO. 4, MERGE CONFLICT NUMBER 4

    @CapCamIII
    CapCamIII committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    91c18e7 View commit details
    Browse the repository at this point in the history

  3. since when are upp survivors a thing

    @CapCamIII
    CapCamIII committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    8a5bcd9 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    0d478ff View commit details
    Browse the repository at this point in the history

  2. im on the edge

    @CapCamIII
    CapCamIII committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    e0e548b View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Merge branch 'master' into upp-guns

    @CapCamIII
    CapCamIII committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    6b78a46 View commit details
    Browse the repository at this point in the history

  2. :trollface:

    @CapCamIII
    CapCamIII committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    1f28d00 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2023

  1. 👍

    @CapCamIII
    CapCamIII committed Aug 18, 2023
    Configuration menu
    Copy the full SHA
    04f2f87 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2023

  1. balance

    @CapCamIII
    CapCamIII committed Aug 19, 2023
    Configuration menu
    Copy the full SHA
    2b2ba4a View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2023

  1. review + stuff i forgot

    @CapCamIII
    CapCamIII committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    4efffe8 View commit details
    Browse the repository at this point in the history

  2. 💒

    @CapCamIII
    CapCamIII committed Aug 22, 2023
    Configuration menu
    Copy the full SHA
    31c3087 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. the time has come

    @CapCamIII
    CapCamIII committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    df9d2ca View commit details
    Browse the repository at this point in the history