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

Personality Behaviors Template #11165

Merged
merged 11 commits into from May 21, 2024
Merged

Personality Behaviors Template #11165

merged 11 commits into from May 21, 2024

Commits on Feb 20, 2024

  1. Added behaviours

    @tuvus
    tuvus committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9b28e5a View commit details
    Browse the repository at this point in the history

  2. Added the behaviours to the docs

    @tuvus
    tuvus committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    97046f9 View commit details
    Browse the repository at this point in the history

  3. Fixed spelling

    @tuvus
    tuvus committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    873044f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into PersonalityBehaviors

    @tuvus
    tuvus committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    31161a8 View commit details
    Browse the repository at this point in the history

  5. Fixed references to PersonalityValue.Military

    @tuvus
    tuvus committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    9ca06ad View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2024

  1. Commented out Personality Behaviours docs and added a message

    @tuvus
    tuvus committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    897a772 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2024

  1. Merge branch 'master' into PersonalityBehaviors 

    # Conflicts:
#	core/src/com/unciv/models/ruleset/nation/Personality.kt
    @tuvus
    tuvus committed Feb 28, 2024
    Configuration menu
    Copy the full SHA
    ebb514f View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2024

  1. Merge branch 'master' into PersonalityBehaviors 

    # Conflicts:
#	docs/Modders/Mod-file-structure/2-Civilization-related-JSON-files.md
    @tuvus
    tuvus committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    468f77f View commit details
    Browse the repository at this point in the history

Commits on May 3, 2024

  1. Merge branch 'master' into PersonalityBehaviors 

    # Conflicts:
#	core/src/com/unciv/logic/automation/city/ConstructionAutomation.kt
#	core/src/com/unciv/models/ruleset/nation/Personality.kt
    @tuvus
    tuvus committed May 3, 2024
    Configuration menu
    Copy the full SHA
    9dfde26 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'master' into PersonalityBehaviors

    @tuvus
    tuvus committed May 15, 2024
    Configuration menu
    Copy the full SHA
    7326aef View commit details
    Browse the repository at this point in the history

  2. Changed the names of some of the new personality behaviours

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