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

Famillies #397

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Famillies #397

wants to merge 8 commits into from

Commits on Jul 19, 2021

  1. XML Utils attributeStringValue

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    77c9175 View commit details
    Browse the repository at this point in the history

  2. StringNonMergingModifier

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    27fe8d1 View commit details
    Browse the repository at this point in the history

  3. Famillies - city can have only one color of shields

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    1aa6f03 View commit details
    Browse the repository at this point in the history

  4. Update to NonMergingNonEmptyModifier

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    70b8ab6 View commit details
    Browse the repository at this point in the history

  5. Fix modifier usage to find "merged" different values as empty string

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    a4eaefb View commit details
    Browse the repository at this point in the history

  6. Removed attributeStringValue and use xml.has/getAttribute

    @stanolacko
    stanolacko committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    da90845 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2022

  1. Merge remote-tracking branch 'upstream/master' into famillies 

    # Conflicts:
#	src/main/java/com/jcloisterzone/engine/Engine.java
    @stanolacko
    stanolacko committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    79b6632 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Merge remote-tracking branch 'upstream/master' into famillies

    @stanolacko
    stanolacko committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    aaf5d6d View commit details
    Browse the repository at this point in the history