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.

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

New weather #8218

Merged
merged 57 commits into from
Jul 17, 2014
Merged

New weather #8218

merged 57 commits into from
Jul 17, 2014

Commits on Jul 2, 2014

  1. [WIP] New weather generator.

    Provides the essentials for a new weather generator that would give continuous, static pseudo-random procedural weather from a seed. First commit adds the main class that calculates the variables required (temperature, humidity, pressure) and a test function that outputs a csv file for plotting.
    It is not yet plugged into the game, but the groundwork is there to replace the update_weather() function in game.cpp.
    This is as of now not concerned with the gameplay aspects of weather or adding new weather types. Yet.
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    f0cef5d View commit details
    Browse the repository at this point in the history
  2. Some cleanup

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    a89b12d View commit details
    Browse the repository at this point in the history
  3. Updated Code::Blocks file

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    86a0fb9 View commit details
    Browse the repository at this point in the history
  4. Code cleanup

    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    4967fe9 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2bca1e3 View commit details
    Browse the repository at this point in the history
  6. return value cleanup

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    f4d2b3c View commit details
    Browse the repository at this point in the history
  7. consting of the variabulls

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    6fbdc77 View commit details
    Browse the repository at this point in the history
  8. Struck invalid character

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    4dc39d5 View commit details
    Browse the repository at this point in the history
  9. initializer fix

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    2aa350b View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/pr/1' into new-weather

    Conflicts:
    	src/weather_gen.cpp
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    783a9e8 View commit details
    Browse the repository at this point in the history
  11. Calendar extensions

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    40dbac3 View commit details
    Browse the repository at this point in the history
  12. further calendar extensions

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    3ebb006 View commit details
    Browse the repository at this point in the history
  13. Added weather condition function

    Added first draft of function to resolve a weather object to an in-game weather condition such as rain. Using the old weather enum for now.
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    d1c8e3f View commit details
    Browse the repository at this point in the history
  14. Initializer fix

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    1a5806f View commit details
    Browse the repository at this point in the history
  15. Merge remote-tracking branch 'origin/pr/1' into new-weather

    Conflicts:
    	src/weather_gen.cpp
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    d07e423 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    caaadd6 View commit details
    Browse the repository at this point in the history
  17. Minor consistency fixes

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    748a0db View commit details
    Browse the repository at this point in the history
  18. Merge pull request #1 from wito/new-weather-rework

    [WIP] Some cleanup
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    94a204a View commit details
    Browse the repository at this point in the history
  19. clarifications

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    72bc78a View commit details
    Browse the repository at this point in the history
  20. clarifications

    wito committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    521e26e View commit details
    Browse the repository at this point in the history
  21. Merge pull request #2 from wito/new-weather-rework

    clarifications
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    b71ee9a View commit details
    Browse the repository at this point in the history
  22. Swap Perlin for simplex

    Changes the noise generator library.
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    96c12b7 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    60d00b9 View commit details
    Browse the repository at this point in the history
  24. Revert "Remove unnecessary arithmetic."

    This reverts commit 60d00b9.
    Efimero committed Jul 2, 2014
    Configuration menu
    Copy the full SHA
    694a023 View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    fb50377 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2014

  1. Configuration menu
    Copy the full SHA
    cae34a7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    509713d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8f4fe60 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    16cd5d0 View commit details
    Browse the repository at this point in the history
  5. Replace the weather forecast for something that uses the new weather …

    …generator. Needs to be refined.
    Efimero committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    5373782 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    675542d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5f3f3ca View commit details
    Browse the repository at this point in the history
  8. another fix

    Efimero committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    12c320b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    8cd1f56 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    456da78 View commit details
    Browse the repository at this point in the history
  11. fix u.pos()

    Efimero committed Jul 4, 2014
    Configuration menu
    Copy the full SHA
    f9a5ddc View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    bd236a4 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2014

  1. Configuration menu
    Copy the full SHA
    9478eb1 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2014

  1. in map.cpp

    fix call to rotten instead of calc_rot in map.cpp
    add call to calc_rot on process_active_item
    Efimero committed Jul 6, 2014
    Configuration menu
    Copy the full SHA
    f7eea8a View commit details
    Browse the repository at this point in the history
  2. astyle game.h and game.cpp

    Efimero committed Jul 6, 2014
    Configuration menu
    Copy the full SHA
    39d00ef View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream/master' into new-weather-funnels

    Conflicts:
    	src/game.cpp
    	src/game.h
    Efimero committed Jul 6, 2014
    Configuration menu
    Copy the full SHA
    7dbc004 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    21adedb View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2014

  1. Configuration menu
    Copy the full SHA
    f8f7cf5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9a8bc54 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2014

  1. Merge remote-tracking branch 'origin/compatibility-fix' into new-weat…

    …her-funnels
    
    Conflicts:
    	src/map.cpp
    Efimero committed Jul 10, 2014
    Configuration menu
    Copy the full SHA
    1f4350e View commit details
    Browse the repository at this point in the history
  2. delete unnecessary infinite recursion on calc_rot

    it was there due to a bad refactoring copy-paste
    don't refactor by copypasting, kids!
    Efimero committed Jul 10, 2014
    Configuration menu
    Copy the full SHA
    d0d2d4c View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2014

  1. Configuration menu
    Copy the full SHA
    972f770 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2014

  1. Configuration menu
    Copy the full SHA
    e41ff30 View commit details
    Browse the repository at this point in the history
  2. more cleanup

    Efimero committed Jul 12, 2014
    Configuration menu
    Copy the full SHA
    d8184c6 View commit details
    Browse the repository at this point in the history
  3. weather radio adjustments

    fired John; he was giving too precise weather reports
    hired a blind weasel to make the weather reports; now they are appropriately innaccurate
    Efimero committed Jul 12, 2014
    Configuration menu
    Copy the full SHA
    df081ac View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2014

  1. CB automatically re-sorted the new entries in the project file

    so we had a party
    Efimero committed Jul 13, 2014
    Configuration menu
    Copy the full SHA
    7968cb3 View commit details
    Browse the repository at this point in the history
  2. fixed rotting calculations

    things won't instantly rot anymore
    some say this is a good thing
    Efimero committed Jul 13, 2014
    Configuration menu
    Copy the full SHA
    e1b6dd0 View commit details
    Browse the repository at this point in the history
  3. don't forget newly created items

    we had a bad day the last time that happened
    Efimero committed Jul 13, 2014
    Configuration menu
    Copy the full SHA
    272d1e3 View commit details
    Browse the repository at this point in the history
  4. make food items active unless they're rotten

    this will ensure food actually rots each turn
    food that never rots is bad for our business
    Efimero committed Jul 13, 2014
    Configuration menu
    Copy the full SHA
    4468053 View commit details
    Browse the repository at this point in the history
  5. properly fix the rotting stuff

    again
    the first time wasn't good enough
    it will need another fix to be sure
    there are never enough fixes to be sure
    Efimero committed Jul 13, 2014
    Configuration menu
    Copy the full SHA
    946f873 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2014

  1. Configuration menu
    Copy the full SHA
    5126cea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e1f611c View commit details
    Browse the repository at this point in the history