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

Reworked how crafting skill requirement display is generated. #36089

Merged
merged 10 commits into from
Apr 24, 2020
Merged

Reworked how crafting skill requirement display is generated. #36089

merged 10 commits into from
Apr 24, 2020

Commits on Jan 8, 2020

  1. Reworked how crafting skill requirement display is generated.

    @ishtatann
    ishtatann committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    9e175fd View commit details
    Browse the repository at this point in the history

  2. Include skill.h so that the templates have complete types.

    @ishtatann
    ishtatann committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    e224560 View commit details
    Browse the repository at this point in the history

  3. Include character.h so that the templates have complete types.

    @ishtatann
    ishtatann committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    93c1c67 View commit details
    Browse the repository at this point in the history

  4. use is_null instead of comparing against "none". 

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    @ishtatann @BevapDin
    ishtatann and BevapDin committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    79db7a9 View commit details
    Browse the repository at this point in the history

  5. use is_null instead of comparing against "none". 

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    @ishtatann @BevapDin
    ishtatann and BevapDin committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    d88389c View commit details
    Browse the repository at this point in the history

  6. use is_null instead of comparing against "none". 

    Co-Authored-By: BevapDin <tho_ki@gmx.de>
    @ishtatann @BevapDin
    ishtatann and BevapDin committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    b39a390 View commit details
    Browse the repository at this point in the history

  7. Moved the templates from recipe.h to recipe.cpp. 

    Removed the includes I had added into recipe.h for the templates.
Moved the templates out of the recipe class since the templates didn't access any member variables.
Renamed the templates from required_skills_string to required_skills_as_string to avoid confusing the compiler.
    @ishtatann
    ishtatann committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    d250619 View commit details
    Browse the repository at this point in the history

  8. Switch from list to vector. 

    Co-Authored-By: John Bytheway <jbytheway@gmail.com>
    @ishtatann @jbytheway
    ishtatann and jbytheway committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    e9cbab0 View commit details
    Browse the repository at this point in the history

  9. Switch from list to vector. Fix naming convention on the template ite… 

    …rators. Use copy instead of for loop.

Addressing PR comments.
    @ishtatann
    ishtatann committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    157857f View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. Merge branch 'master' into ishta-skill-requirement-display

    @kevingranade
    kevingranade committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    075eea0 View commit details
    Browse the repository at this point in the history