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

Linked sprite support, custom MovingSprite light sprites #2753

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Linked sprite support, custom MovingSprite light sprites #2753

wants to merge 27 commits into from

Commits on Jan 28, 2024

  1. Linked sprite support 

    Objects which utilize more than 1 sprite now get the files of their additional sprites from the main one's "linked-sprites" list.

This allows for expanded sprite customization for objects.
    @Vankata453
    Vankata453 committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    355eb19 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. MovingSprite light sprite support 

    Custom lightsprites can now be added to all objects, which inherit `MovingSprite`.

Setting a custom color for the lightsprite is also possible, as long as the object is not designed to use foreign color values (for example, from an option).
    @Vankata453
    Vankata453 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    653d258 View commit details
    Browse the repository at this point in the history

  2. MovingSprite: Use a map for linked sprites list, instead of struct

    @Vankata453
    Vankata453 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    866af12 View commit details
    Browse the repository at this point in the history

  3. "light" -> "on-light" 

    [ci skip]
    @Vankata453
    Vankata453 authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    bf855b5 View commit details
    Browse the repository at this point in the history

  4. Undo unneeded changes to "red-potion.sprite" 

    [ci skip]
    @Vankata453
    Vankata453 authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    073c426 View commit details
    Browse the repository at this point in the history

  5. SpriteManager: Dummy sprite data handling improvements

    @Vankata453
    Vankata453 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f11eebf View commit details
    Browse the repository at this point in the history

  6. Sprite action-specific linked sprites 

    Linked sprites can now be added to sprite actions too. If a sprite with the same key is found in the general linked sprites block and the action-specific one, the sprite specified by the action will be prioritized, thus overriding the default linked sprite file.
    @Vankata453
    Vankata453 committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    aeab60f View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2024

  1. Default actions for linked sprites

    @Vankata453
    Vankata453 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    25696a4 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'supertux/master' into custom-linked-spr… 

    …ites
    @Vankata453
    Vankata453 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    abb7455 View commit details
    Browse the repository at this point in the history

  3. Fix torch.sprite [ci skip]

    @Vankata453
    Vankata453 committed Jun 15, 2024
    Configuration menu
    Copy the full SHA
    c9ebd6e View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. Merge branch 'real-master' into custom-linked-sprites

    @MatusGuy
    MatusGuy committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    7f62ce9 View commit details
    Browse the repository at this point in the history

  2. light is stupid i hate it

    @MatusGuy
    MatusGuy committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    aa8dcf6 View commit details
    Browse the repository at this point in the history

  3. dart light ooooo BUT ITS BLURRY WHAHAHA

    @MatusGuy
    MatusGuy committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    90e8086 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2024

  1. Un-hardcode linked sprite actions, allow for setting custom loop count

    @Vankata453
    Vankata453 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    10269ad View commit details
    Browse the repository at this point in the history

  2. Undo DiveMine hitbox changes [ci skip]

    @Vankata453
    Vankata453 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    1743ffd View commit details
    Browse the repository at this point in the history

  3. Undo DiveMine hitbox changes [ci skip]

    @Vankata453
    Vankata453 committed Aug 31, 2024
    Configuration menu
    Copy the full SHA
    f9bd9f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2024

  1. Merge remote-tracking branch 'supertux/master' into custom-linked-spr… 

    …ites
    @Vankata453
    Vankata453 committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    0084152 View commit details
    Browse the repository at this point in the history

  2. Fix Candle custom light sprites not being configured

    @Vankata453
    Vankata453 committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    4f778d9 View commit details
    Browse the repository at this point in the history

  3. Do not use Dart light sprite as BadGuy::lightsprite

    @Vankata453
    Vankata453 committed Nov 18, 2024
    Configuration menu
    Copy the full SHA
    3a6141e View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2024

  1. Fix SpriteData code duplication, remove sprite hardcoding for many … 

    …`SpriteParticle`s
    @Vankata453
    Vankata453 committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    87e89cf View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2024

  1. Merge branch 'master' into custom-linked-sprites

    @Vankata453
    Vankata453 authored Nov 22, 2024
    Configuration menu
    Copy the full SHA
    4fddd07 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2024

  1. Crusher now draws its custom light sprite

    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    882eeb1 View commit details
    Browse the repository at this point in the history

  2. Fix "Missing sprite" issues with some objects

    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    a2f4d77 View commit details
    Browse the repository at this point in the history

  3. Replace m_sprite->clone() with a linked sprite in objects 

    Crushers and bricks now use linked sprites, instead of cloning their own sprite and setting actions on its clone.
    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    380ea8b View commit details
    Browse the repository at this point in the history

  4. "light" -> "on-light", remove unneeded set_blend

    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    ebe57ca View commit details
    Browse the repository at this point in the history

  5. Remove more unneeded set_blend(Blend::ADD) 

    [ci skip]
    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    22de58b View commit details
    Browse the repository at this point in the history

  6. WeakBlock: lightsprite -> m_burn_sprite 

    [ci skip]
    @Vankata453
    Vankata453 committed Nov 23, 2024
    Configuration menu
    Copy the full SHA
    b5c798c View commit details
    Browse the repository at this point in the history