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

Extra curse traps #653

Merged
merged 9 commits into from
Mar 21, 2023
Merged

Extra curse traps #653

merged 9 commits into from
Mar 21, 2023

Commits on Mar 11, 2023

  1. New curse traps

    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    a11fd47 View commit details
    Browse the repository at this point in the history

  2. Run automatic format script as code does not match clang format rules. 

    Developers please rebase to avoid merge conflicts!
    @Roberto-Nessy @github-actions
    Roberto-Nessy authored and github-actions[bot] committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    b5286bf View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict maybe?

    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    f3af95d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/roll-traps' into roll-traps

    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    cfaad95 View commit details
    Browse the repository at this point in the history

  5. Fix merge conflict

    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    f4dd717 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/roll-traps' into roll-traps 

    # Conflicts:
#	code/oot.ld
#	code/oot_e.ld
    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    06c4970 View commit details
    Browse the repository at this point in the history

  7. Make screen traps subset of curse traps

    @Roberto-Nessy
    Roberto-Nessy committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    942bf8b View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Fix option not being hidden with other trap types + LLR logic fixes

    @Roberto-Nessy
    Roberto-Nessy committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    5207ee7 View commit details
    Browse the repository at this point in the history

  2. Run automatic format script as code does not match clang format rules. 

    Developers please rebase to avoid merge conflicts!
    @Roberto-Nessy @github-actions
    Roberto-Nessy authored and github-actions[bot] committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    4ce6b78 View commit details
    Browse the repository at this point in the history