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

miscellaneous XSTR cleanup #2105

Merged
merged 9 commits into from Oct 14, 2019
Merged

miscellaneous XSTR cleanup #2105

merged 9 commits into from Oct 14, 2019

Commits on Oct 12, 2019

  1. add xstr capability for medals 

    The grant-medal and was-medal-granted sexps will now translate medal names, in the same way that tech-add-intel-xstr translates intel entries.  There is also some minor cleanup and the specifying of correct default -1 numbers for the xstr-capable sexps.
    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    a34d696 View commit details
    Browse the repository at this point in the history

  2. this isn't actually needed

    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    53ec0d4 View commit details
    Browse the repository at this point in the history

  3. the variable can never be uninitialized here, but Travis is too dumb … 

    …to realize it
    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    e91ee3d View commit details
    Browse the repository at this point in the history

  4. restore the original grant-medal and was-medal-granted sexps

    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    6006670 View commit details
    Browse the repository at this point in the history

  5. now CTEXT will never be NULL

    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    ff31beb View commit details
    Browse the repository at this point in the history

  6. fix const conflict

    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    2de323e View commit details
    Browse the repository at this point in the history

  7. ohcomeon.gif

    @Goober5000
    Goober5000 committed Oct 12, 2019
    Copy the full SHA
    09f1de6 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2019

  1. change token string, per m!m's review

    @Goober5000
    Goober5000 committed Oct 13, 2019
    Copy the full SHA
    334f392 View commit details
    Browse the repository at this point in the history

  2. formatting tweak, mainly to try to get the builds to trigger

    @Goober5000
    Goober5000 committed Oct 13, 2019
    Copy the full SHA
    18e9746 View commit details
    Browse the repository at this point in the history