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

Lightning can now be fired from traps manually #3211

Merged
merged 15 commits into from
May 12, 2024
Merged

Lightning can now be fired from traps manually #3211

merged 15 commits into from
May 12, 2024

Commits on May 1, 2024

  1. Lightning can now be fired from traps manually 

    Fixes dkfans#3210
    @AdamPlenty
    AdamPlenty committed May 1, 2024
    Configuration menu
    Copy the full SHA
    358ffa4 View commit details
    Browse the repository at this point in the history

  2. Exclude Boulders from auto-aiming

    @AdamPlenty
    AdamPlenty committed May 1, 2024
    Configuration menu
    Copy the full SHA
    5fce5f4 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Fixed trap not rotating when slapped

    @Loobinex
    Loobinex committed May 4, 2024
    Configuration menu
    Copy the full SHA
    3c5d9c8 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. Merge remote-tracking branch 'upstream/master' into TrapShootLightning

    @AdamPlenty
    AdamPlenty committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4d6ae49 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into TrapShootLightning

    @AdamPlenty
    AdamPlenty committed May 5, 2024
    Configuration menu
    Copy the full SHA
    3d49aec View commit details
    Browse the repository at this point in the history

  3. No longer hardcode it to exclude ShMF_Boulder

    @Loobinex
    Loobinex committed May 5, 2024
    Configuration menu
    Copy the full SHA
    0a58c78 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. No longer hardcode it to exclude ShMF_Boulder

    @Loobinex
    Loobinex committed May 6, 2024
    Configuration menu
    Copy the full SHA
    4797a6f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'TrapShootLightning' of https://github.com/AdamPlenty/ke… 

    …eperfx into TrapShootLightning
    @AdamPlenty
    AdamPlenty committed May 6, 2024
    Configuration menu
    Copy the full SHA
    0a35e07 View commit details
    Browse the repository at this point in the history

  3. Fixed 2 not being slappable

    @Loobinex @AdamPlenty
    Loobinex authored and AdamPlenty committed May 6, 2024
    Configuration menu
    Copy the full SHA
    4b1b244 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge remote-tracking branch 'upstream/master' into TrapShootLightning

    @AdamPlenty
    AdamPlenty committed May 9, 2024
    Configuration menu
    Copy the full SHA
    83f6ea5 View commit details
    Browse the repository at this point in the history

  2. Made trap fields follow naming convention

    @Loobinex
    Loobinex committed May 9, 2024
    Configuration menu
    Copy the full SHA
    2040dbc View commit details
    Browse the repository at this point in the history

  3. Fixed build warning

    @Loobinex
    Loobinex committed May 9, 2024
    Configuration menu
    Copy the full SHA
    bc22d05 View commit details
    Browse the repository at this point in the history

  4. Fixed another build warning, caused by same fix

    @Loobinex
    Loobinex committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5449b1d View commit details
    Browse the repository at this point in the history

  5. Update packets_input.c

    @AdamPlenty
    AdamPlenty committed May 9, 2024
    Configuration menu
    Copy the full SHA
    a38b49c View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Merge remote-tracking branch 'upstream/master' into TrapShootLightning

    @AdamPlenty
    AdamPlenty committed May 12, 2024
    Configuration menu
    Copy the full SHA
    30da752 View commit details
    Browse the repository at this point in the history