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

Add sign #548

Merged
merged 21 commits into from
Apr 2, 2024
Merged

Add sign #548

merged 21 commits into from
Apr 2, 2024

Commits on Aug 2, 2023

  1. Add sign

    @BenCheung0422
    BenCheung0422 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    6e44ed8 View commit details
    Browse the repository at this point in the history

  2. Fix an error of sign

    @BenCheung0422
    BenCheung0422 committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    e331c54 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Add sign tile data save and load support

    @BenCheung0422
    BenCheung0422 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    d4cb9bb View commit details
    Browse the repository at this point in the history

  2. Fix input filter and sign item name

    @BenCheung0422
    BenCheung0422 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    a8399e8 View commit details
    Browse the repository at this point in the history

  3. Fix more problems related to sign

    @BenCheung0422
    BenCheung0422 committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    ee4a8b6 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2023

  1. Fix some sign edit and rendering problems

    @BenCheung0422
    BenCheung0422 committed Aug 4, 2023
    Configuration menu
    Copy the full SHA
    40a8bd4 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. Resolve SignDisplay OSK and cursor problems

    @BenCheung0422
    BenCheung0422 committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    a4d469c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge branch 'main' into sign

    @Litorom
    Litorom authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    24808bf View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2024

  1. Merge remote-tracking branch 'upstream/main' into sign 

    # Conflicts:
#	src/client/java/minicraft/core/io/InputHandler.java
#	src/client/java/minicraft/item/Items.java
#	src/client/java/minicraft/level/Level.java
#	src/client/java/minicraft/level/tile/Tiles.java
#	src/client/java/minicraft/level/tile/TorchTile.java
    @BenCheung0422
    BenCheung0422 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    87735cb View commit details
    Browse the repository at this point in the history

  2. Resolve post-merge errors

    @BenCheung0422
    BenCheung0422 committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    42abfbb View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. Add SignTileEntity in place of sign tile bumping

    @BenCheung0422
    BenCheung0422 committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    3e961ca View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2024

  1. Merge branch 'main' into sign

    @Litorom
    Litorom authored Feb 16, 2024
    Configuration menu
    Copy the full SHA
    d1090ab View commit details
    Browse the repository at this point in the history

  2. Remove SHIFT-[S|W] debugging keys

    @BenCheung0422
    BenCheung0422 committed Feb 16, 2024
    Configuration menu
    Copy the full SHA
    5d7df9a View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2024

  1. Add back SHIFT-[S|W] debugging keys

    @BenCheung0422
    BenCheung0422 committed Feb 25, 2024
    Configuration menu
    Copy the full SHA
    1ffa8f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge branch 'main' into sign

    @Litorom
    Litorom authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    4231908 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into sign

    @Litorom
    Litorom authored Mar 11, 2024
    Configuration menu
    Copy the full SHA
    67c51dc View commit details
    Browse the repository at this point in the history

  3. Fixed Conflicts

    @Litorom
    Litorom committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    20365ff View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Merge branch 'main' into sign

    @Litorom
    Litorom authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    455e7d4 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Merge remote-tracking branch 'upstream/main' into sign 

    # Conflicts:
#	src/client/java/minicraft/level/Level.java
#	src/client/java/minicraft/level/tile/Tiles.java
#	src/client/java/minicraft/level/tile/TorchTile.java
#	src/client/java/minicraft/saveload/Load.java
    @BenCheung0422
    BenCheung0422 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ebe917f View commit details
    Browse the repository at this point in the history

  2. Update Sign to have similar mechanisms as Torch

    @BenCheung0422
    BenCheung0422 committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    50b59bb View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2024

  1. Merge branch 'main' into sign

    @Litorom
    Litorom authored Apr 1, 2024
    Configuration menu
    Copy the full SHA
    d26140b View commit details
    Browse the repository at this point in the history