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

Backend: Add dungeon phases #1865

Merged
merged 23 commits into from
Oct 11, 2024
Merged

Backend: Add dungeon phases #1865

merged 23 commits into from
Oct 11, 2024

Commits on May 21, 2024

  1. start

    @martimavocado
    martimavocado committed May 21, 2024
    Configuration menu
    Copy the full SHA
    ce4996d View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. start dungeon phases

    @martimavocado
    martimavocado committed May 22, 2024
    Configuration menu
    Copy the full SHA
    0a1323d View commit details
    Browse the repository at this point in the history

  2. move to dungeonapi

    @martimavocado
    martimavocado committed May 22, 2024
    Configuration menu
    Copy the full SHA
    bdcfa5f View commit details
    Browse the repository at this point in the history

  3. finish phasechange event

    @martimavocado
    martimavocado committed May 22, 2024
    Configuration menu
    Copy the full SHA
    415d8a1 View commit details
    Browse the repository at this point in the history

  4. add comments

    @martimavocado
    martimavocado committed May 22, 2024
    Configuration menu
    Copy the full SHA
    6abc939 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Merge remote-tracking branch 'refs/remotes/hannibal/beta' into dungeo… 

    …n-phases
    @martimavocado
    martimavocado committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    d59a8cf View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. fix necron pattern, add regex test

    @martimavocado
    martimavocado committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    900a64f View commit details
    Browse the repository at this point in the history

  2. remove debug message

    @martimavocado
    martimavocado committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    5f45d30 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge remote-tracking branch 'hannibal/beta' into dungeon-phases

    @martimavocado
    martimavocado committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    84ecff8 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge remote-tracking branch 'hannibal002/beta' into dungeon-phases 

    # Conflicts:
#	src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt
    @martimavocado
    martimavocado committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    f603736 View commit details
    Browse the repository at this point in the history

  2. add more regex tests

    @martimavocado
    martimavocado committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    fee8daa View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge branch 'beta' into dungeon-phases

    @CalMWolfs
    CalMWolfs authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    f6b340d View commit details
    Browse the repository at this point in the history

  2. code fixes

    @CalMWolfs
    CalMWolfs committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    e4fca94 View commit details
    Browse the repository at this point in the history

  3. formatting

    @CalMWolfs
    CalMWolfs committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    8193589 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Merge remote-tracking branch 'hannibal002/beta' into dungeon-phases

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    96585e6 View commit details
    Browse the repository at this point in the history

  2. move to dungeonbossapi

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    f2f890c View commit details
    Browse the repository at this point in the history

  3. rename patterngroup

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    c8687b6 View commit details
    Browse the repository at this point in the history

  4. oops

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    b75ed2f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refs/heads/beta' into fork/martimavocado/dungeon-phases

    @hannibal002
    hannibal002 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    5c9845f View commit details
    Browse the repository at this point in the history

  6. renamed

    @hannibal002
    hannibal002 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    3d31a5f View commit details
    Browse the repository at this point in the history

  7. fix typo

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    4411748 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'martimavocado/dungeon-phases' into dung… 

    …eon-phases
    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    84aee8c View commit details
    Browse the repository at this point in the history

  9. git haunts my dreams

    @martimavocado
    martimavocado committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    243f158 View commit details
    Browse the repository at this point in the history