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

Asset providers #304

Merged
merged 8 commits into from
Aug 10, 2024
Merged

Asset providers #304

merged 8 commits into from
Aug 10, 2024

Commits on Jul 2, 2024

  1. Added asset classes.

    @Pars3ct
    Pars3ct committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    cf47a57 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Still trying to figure out assets.

    @Pars3ct
    Pars3ct committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0c1fcbf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upstream' into AssetProviders 

    # Conflicts:
#	src/system/meta/FixedSizeSaveable.h
    @Pars3ct
    Pars3ct committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    14694c3 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. Putting assets on hold for now.

    @Pars3ct
    Pars3ct committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    63f8967 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. Code cleanup

    @Pars3ct
    Pars3ct committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    016c8cb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master-2' into AssetProviders

    @Pars3ct
    Pars3ct committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    30aa1e0 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. Matched ProfileAssets

    @Pars3ct
    Pars3ct committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    59ba297 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master-2' into AssetProviders

    @Pars3ct
    Pars3ct committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    18775a1 View commit details
    Browse the repository at this point in the history