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

Hotfix/fix happiness #905

Merged
merged 8 commits into from
Apr 30, 2017
Merged

Hotfix/fix happiness #905

merged 8 commits into from
Apr 30, 2017

Commits on Apr 30, 2017

  1. save happiness and don't devidi through 0

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    f1c32e6 View commit details
    Browse the repository at this point in the history

  2. add constants

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    5d08f0a View commit details
    Browse the repository at this point in the history

  3. check if citizenData != null first

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    8e14968 View commit details
    Browse the repository at this point in the history

  4. fix assets

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    c6b35c4 View commit details
    Browse the repository at this point in the history

  5. another hotfix, new citizen cause crash if happiness 1

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    7ca2323 View commit details
    Browse the repository at this point in the history

  6. Merged branch release/1.10 into hotfix/fix-happiness

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    d06ecd0 View commit details
    Browse the repository at this point in the history

  7. don't double request resources

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    aec2e75 View commit details
    Browse the repository at this point in the history

  8. Fix prboblem with incorrect amount of entities requesting

    @Raycoms
    Raycoms committed Apr 30, 2017
    Configuration menu
    Copy the full SHA
    22d6fa5 View commit details
    Browse the repository at this point in the history