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

[GH-280] Display Energy bar in Battle #420

Merged
merged 15 commits into from
May 16, 2024
Merged

[GH-280] Display Energy bar in Battle #420

merged 15 commits into from
May 16, 2024

Commits on May 3, 2024

  1. Add energy bar to unit prefab

    @ncontinanza
    ncontinanza committed May 3, 2024
    Configuration menu
    Copy the full SHA
    65c4d69 View commit details
    Browse the repository at this point in the history

  2. Set and increase energy values. Override unit's energy after using th… 

    …e ultimate skill
    @ncontinanza
    ncontinanza committed May 3, 2024
    Configuration menu
    Copy the full SHA
    f64f4fc View commit details
    Browse the repository at this point in the history

  3. Improve energy bar background and color

    @ncontinanza
    ncontinanza committed May 3, 2024
    Configuration menu
    Copy the full SHA
    56baab5 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge branch 'main' of github.com:lambdaclass/champions_of_mirra into g… 

    …h-280-energy-bar
    @ncontinanza
    ncontinanza committed May 7, 2024
    Configuration menu
    Copy the full SHA
    890875b View commit details
    Browse the repository at this point in the history

  2. Limit the amount to add or substract from the unit's energy

    @ncontinanza
    ncontinanza committed May 7, 2024
    Configuration menu
    Copy the full SHA
    a2b9d6c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' of github.com:lambdaclass/champions_of_mirra into g… 

    …h-280-energy-bar
    @ncontinanza
    ncontinanza committed May 7, 2024
    Configuration menu
    Copy the full SHA
    f90a5e1 View commit details
    Browse the repository at this point in the history

  4. regen protos

    @ncontinanza
    ncontinanza committed May 7, 2024
    Configuration menu
    Copy the full SHA
    aab1ab2 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. Merge branch 'main' of github.com:lambdaclass/champions_of_mirra into g… 

    …h-280-energy-bar
    @ncontinanza
    ncontinanza committed May 9, 2024
    Configuration menu
    Copy the full SHA
    c2b2797 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge branch 'main' of github.com:lambdaclass/champions_of_mirra into g… 

    …h-280-energy-bar
    @ncontinanza
    ncontinanza committed May 13, 2024
    Configuration menu
    Copy the full SHA
    1d1c2a8 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'main' of github.com:lambdaclass/champions_of_mirra into g… 

    …h-280-energy-bar
    @ncontinanza
    ncontinanza committed May 15, 2024
    Configuration menu
    Copy the full SHA
    40c0c17 View commit details
    Browse the repository at this point in the history

  2. Regenerate protos

    @ncontinanza
    ncontinanza committed May 15, 2024
    Configuration menu
    Copy the full SHA
    5c9ee31 View commit details
    Browse the repository at this point in the history

  3. Fix formatting after merge

    @ncontinanza
    ncontinanza committed May 15, 2024
    Configuration menu
    Copy the full SHA
    51b1d16 View commit details
    Browse the repository at this point in the history

  4. Prevent null reference in battles with less than 6 units

    @ncontinanza
    ncontinanza committed May 15, 2024
    Configuration menu
    Copy the full SHA
    769b4de View commit details
    Browse the repository at this point in the history

  5. Prevent null reference in battles with less than 6 units

    @ncontinanza
    ncontinanza committed May 15, 2024
    Configuration menu
    Copy the full SHA
    9edfdfb View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Remove logic from the stat override that is already done in the backend

    @ncontinanza
    ncontinanza committed May 16, 2024
    Configuration menu
    Copy the full SHA
    bb886a3 View commit details
    Browse the repository at this point in the history