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

super speshul m4ra #89

Merged
merged 21 commits into from
Jan 18, 2024
Merged

super speshul m4ra #89

merged 21 commits into from
Jan 18, 2024

Commits on Jan 10, 2024

  1. initial

    @bearrrrrrrr
    bearrrrrrrr committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    398a0dd View commit details
    Browse the repository at this point in the history

  2. annoyingly, this seems to be the only way to do sprites. it otherwise… 

    … calls from the wrong file
    @bearrrrrrrr
    bearrrrrrrr committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    5480a88 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. i love cruelty squad

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    79f223f View commit details
    Browse the repository at this point in the history

  2. finishing touches on the gun itself

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    0fc0fc4 View commit details
    Browse the repository at this point in the history

  3. knockback. feels pretty good actually

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    d171042 View commit details
    Browse the repository at this point in the history

  4. adds it to the gunny's room

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    ed542df View commit details
    Browse the repository at this point in the history

  5. map fixes, oops

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    a04f153 View commit details
    Browse the repository at this point in the history

  6. ok map for real

    @bearrrrrrrr
    bearrrrrrrr committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    b3579b2 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2024

  1. minor typo, i lose....

    @bearrrrrrrr
    bearrrrrrrr authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    bae2858 View commit details
    Browse the repository at this point in the history

  2. MINOR SYNTAX ERROR, I LOSE

    @bearrrrrrrr
    bearrrrrrrr authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    6916224 View commit details
    Browse the repository at this point in the history

  3. FINAL MINOR SPELLING MISTAKE. I WIN.

    @bearrrrrrrr
    bearrrrrrrr authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    979a04e View commit details
    Browse the repository at this point in the history

  4. ffffix

    @bearrrrrrrr
    bearrrrrrrr authored Jan 12, 2024
    Configuration menu
    Copy the full SHA
    b39f226 View commit details
    Browse the repository at this point in the history

  5. fixes belt in gunny room to not be the m16 ammo belt. holy

    @bearrrrrrrr
    bearrrrrrrr committed Jan 12, 2024
    Configuration menu
    Copy the full SHA
    02fa20d View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. oops.....

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    ce001bf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into wipm4ra0110 

    # Conflicts:
#	maps/map_files/golden_arrow/golden_arrow.dmm
    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    77629c1 View commit details
    Browse the repository at this point in the history

  3. a

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    01c612a View commit details
    Browse the repository at this point in the history

  4. OUGHHH

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    8d4726c View commit details
    Browse the repository at this point in the history

  5. flavor fix and im just gonna collapse if this doesn't pass linters tbh

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    07b94e1 View commit details
    Browse the repository at this point in the history

  6. catches autowiki

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    66fd09a View commit details
    Browse the repository at this point in the history

  7. cleanup

    @bearrrrrrrr
    bearrrrrrrr committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    f508aeb View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Merge branch 'master' into wipm4ra0110

    @FslashN
    FslashN authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    15ce4e9 View commit details
    Browse the repository at this point in the history