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

Texture Atlas rework #5103

Merged
merged 16 commits into from
Jan 16, 2024
Merged

Texture Atlas rework #5103

merged 16 commits into from
Jan 16, 2024

Commits on May 13, 2023

  1. Texture Atlas rework

    @ManevilleF
    ManevilleF committed May 13, 2023
    Configuration menu
    Copy the full SHA
    163fb78 View commit details
    Browse the repository at this point in the history

  2. Unify SpriteBundle and SpriteSheetBundle 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @ManevilleF @alice-i-cecile
    ManevilleF and alice-i-cecile committed May 13, 2023
    Configuration menu
    Copy the full SHA
    c18c9e4 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: François <mockersf@gmail.com>
    @ManevilleF @mockersf
    ManevilleF and mockersf committed May 13, 2023
    Configuration menu
    Copy the full SHA
    3a6fa5a View commit details
    Browse the repository at this point in the history

  4. Docs improvements

    @ManevilleF
    ManevilleF committed May 13, 2023
    Configuration menu
    Copy the full SHA
    214d10d View commit details
    Browse the repository at this point in the history

  5. Rebased on main

    @ManevilleF
    ManevilleF committed May 13, 2023
    Configuration menu
    Copy the full SHA
    dc918ec View commit details
    Browse the repository at this point in the history

  6. texture atlas layout in the texture atlas module

    @ManevilleF
    ManevilleF committed May 13, 2023
    Configuration menu
    Copy the full SHA
    92b84ef View commit details
    Browse the repository at this point in the history

  7. Rebase on main

    @ManevilleF
    ManevilleF committed May 13, 2023
    Configuration menu
    Copy the full SHA
    bfcd2fa View commit details
    Browse the repository at this point in the history

  8. Apply suggestions from code review 

    Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
    @ManevilleF @alice-i-cecile
    ManevilleF and alice-i-cecile committed May 13, 2023
    Configuration menu
    Copy the full SHA
    1b0969d View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2024

  1. Merge branch 'main' into feat/texture_atlas_rework

    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    cab2c97 View commit details
    Browse the repository at this point in the history

  2. UI texture atlas

    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b5fadf7 View commit details
    Browse the repository at this point in the history

  3. example cleanup

    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b239052 View commit details
    Browse the repository at this point in the history

  4. review comments

    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    b2e3d8f View commit details
    Browse the repository at this point in the history

  5. Fix texture atlas example

    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    27bb330 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' 

    Conflicts:
	crates/bevy_sprite/src/bundle.rs
	crates/bevy_sprite/src/lib.rs
	crates/bevy_sprite/src/render/mod.rs
    @ManevilleF
    ManevilleF committed Jan 15, 2024
    Configuration menu
    Copy the full SHA
    3127d0a View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Typo 

    Co-authored-by: IceSentry <IceSentry@users.noreply.github.com>
    @alice-i-cecile @IceSentry
    alice-i-cecile and IceSentry committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    8bb3a61 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/texture_atlas_rework

    @ManevilleF
    ManevilleF committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    a9715fd View commit details
    Browse the repository at this point in the history