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

Add support for loading JKA assets. #159

Merged
merged 10 commits into from
May 1, 2023
Merged

Commits on Mar 19, 2023

  1. Add support for loading JKA assets:

    	- new cvar fs_assetsPathJKA; works similar to fs_assetsPath, but automatically tries to detect jka rather than jk2 (using registry keys on Windows and known paths on Mac)
    	- new cvar fs_noJKA; disables loading of jka assets
    	- jka assets are loaded before jk2 assets, thus jk2 files take precedence in case of conflicts
    	- .shader files from jka assets are virtually renamed to .shader_jka and .shader_jka files are loaded with lower priority than .shader files
    	- when trying to load an image the renderer tries to load all extensions without considering the jka assets and only includes jka assets if all extensions failed; this avoids cases of a higher priority extension images from the jka assets overriding jk2 images
    Daggolin committed Mar 19, 2023
    Configuration menu
    Copy the full SHA
    51ed961 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Configuration menu
    Copy the full SHA
    0614c82 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2e4166d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ecd871d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b4bc09f View commit details
    Browse the repository at this point in the history
  5. Make fs_assetspathjka and fs_loadjka cvars lowercase to be more consi…

    …stent with existing cvars.
    Daggolin committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    0d68927 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. Fix fs_loadjka check being inverted (forgot to invert it when renamin…

    …g the cvar from fs_noJKA to fs_loadJKA).
    Daggolin committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    de3d8b3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    775cd2f View commit details
    Browse the repository at this point in the history
  3. Add fs_basejka cvar.

    If fs_basejka is not explicitly set as launch argument:
    	- if fs_assetspathjka is set on launch (either manually or via detection for non-portable versions) the fs_basejka cvar is set to "base"
    	- if fs_assetspathjka is not set on launch the fs_basejka cvar is set to "basejka" to make it easier to manually provide assets
    Daggolin committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    e6804b6 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

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