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.

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

LttP: extract Dungeon and Boss from core #1787

Merged
merged 11 commits into from
May 20, 2023
Merged

Commits on May 2, 2023

  1. Configuration menu
    Copy the full SHA
    334ae97 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2023

  1. Configuration menu
    Copy the full SHA
    39ef1c1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6d519f5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2023

  1. Configuration menu
    Copy the full SHA
    59617a5 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2023

  1. Merge branch 'main' into lttp_free_core_boss_dungeon

    # Conflicts:
    #	worlds/alttp/Dungeons.py
    Berserker66 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    6184e52 View commit details
    Browse the repository at this point in the history
  2. LttP: fix merge conflict

    Berserker66 committed May 10, 2023
    Configuration menu
    Copy the full SHA
    31ce6a1 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. Configuration menu
    Copy the full SHA
    96bcd08 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2023

  1. Merge branch 'main' into lttp_free_core_boss_dungeon

    # Conflicts:
    #	worlds/alttp/Dungeons.py
    Berserker66 committed May 18, 2023
    Configuration menu
    Copy the full SHA
    2ccd041 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6bb8feb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c29f5d7 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'Archipelago/lttp_free_core_boss_dungeon…

    …' into lttp_free_core_boss_dungeon
    Berserker66 committed May 18, 2023
    Configuration menu
    Copy the full SHA
    1f2e89b View commit details
    Browse the repository at this point in the history