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

town demo merged with all the works #8

Open
wants to merge 15 commits into
base: pre-castle-updates
Choose a base branch
from
Open

town demo merged with all the works #8

wants to merge 15 commits into from

Commits on Aug 21, 2024

  1. merged katie's with dash

    @Cocodayow
    Cocodayow committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    6dc9c11 View commit details
    Browse the repository at this point in the history

  2. merged katie's with dash and double jump

    @Cocodayow
    Cocodayow committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    86ce7bd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'side_scroller_2' into merged_w_katie

    @michellelyHuang728
    michellelyHuang728 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    112fb37 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from acmucsd-projects/merged_w_katie 

    merged double jump and dash with katie's
    @michellelyHuang728
    michellelyHuang728 authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    f2c3313 View commit details
    Browse the repository at this point in the history

  5. fixed merge issues

    @Cocodayow
    Cocodayow committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    d6ba8b4 View commit details
    Browse the repository at this point in the history

  6. fixed merge issues

    @Cocodayow
    Cocodayow committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    65192cc View commit details
    Browse the repository at this point in the history

  7. update healthbar for skeleton and player

    @michellelyHuang728
    michellelyHuang728 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    1190054 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Merge pull request #3 from acmucsd-projects/health_bar 

    update healthbar for skeleton and player
    @michellelyHuang728
    michellelyHuang728 authored Aug 22, 2024
    Configuration menu
    Copy the full SHA
    e7e3db9 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. updated a basic implementation of town

    @Cocodayow
    Cocodayow committed Aug 25, 2024
    Configuration menu
    Copy the full SHA
    b9a3624 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2024

  1. town updated with armor shop

    @Cocodayow
    Cocodayow committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    1e29794 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. armor_shop_selection

    @Cocodayow
    Cocodayow committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    4d810bf View commit details
    Browse the repository at this point in the history

  2. armor_shop_buy

    @Cocodayow
    Cocodayow committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    7bba0bd View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. armor_shop_withbg

    @Cocodayow
    Cocodayow committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    4e0184f View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. potion shop done?

    @Cocodayow
    Cocodayow committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    70eb8a7 View commit details
    Browse the repository at this point in the history

  2. potion shop done w updates

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