Merge branch 'colorfret' into 'next' (ab06ff01) · Commits · James Hale / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

ab06ff01

Commit ab06ff01 authored 3 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'colorfret' into 'next'

Respect mobj->color while enemies & bosses flash (resolves #531)

Closes #531

See merge request STJr/SRB2!1513

parents 9e7d619a 750bdd9d

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/hardware/hw_main.c 1 addition, 1 deletion

src/hardware/hw_main.c
src/hardware/hw_md2.c 10 additions, 18 deletions

src/hardware/hw_md2.c
src/r_draw.c 4 additions, 0 deletions

src/r_draw.c
src/r_things.c 1 addition, 1 deletion

src/r_things.c

with 16 additions and 20 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment