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

SCPUI Options Localization #5622

Merged
merged 8 commits into from
Oct 19, 2023
Merged

SCPUI Options Localization #5622

merged 8 commits into from
Oct 19, 2023

Commits on Sep 23, 2023

  1. clean up options builders and use delayed xstr for localization

    @MjnMixael
    MjnMixael committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    a0a5232 View commit details
    Browse the repository at this point in the history

  2. Fix some overlapping xstrs

    @MjnMixael
    MjnMixael committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    aa997dd View commit details
    Browse the repository at this point in the history

  3. xstr the boolean default on/off as well

    @MjnMixael
    MjnMixael committed Sep 23, 2023
    Configuration menu
    Copy the full SHA
    ba2c37a View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. update comments here

    @MjnMixael
    MjnMixael committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    cb5bf05 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Adjust XSTR IDs per feedback

    @MjnMixael
    MjnMixael committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    de11106 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into scpui_options_localization 

    # Conflicts:
#	code/camera/camera.cpp
    @MjnMixael
    MjnMixael committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    e2aac31 View commit details
    Browse the repository at this point in the history

  3. "nothing" to see here

    @MjnMixael
    MjnMixael committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    705287c View commit details
    Browse the repository at this point in the history

  4. We'll get this right eventually

    @MjnMixael
    MjnMixael committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    762cf4c View commit details
    Browse the repository at this point in the history