Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

14c6d93c

Commit 14c6d93c authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'team-elementalfire' into 'next'

Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312

parents 804e0495 f2095b57

Branches

Tags

1 merge request!1312Player-Colored Elemental Fire for competitive gametypes

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/deh_tables.c 7 additions, 0 deletions

src/deh_tables.c
src/hardware/hw_light.c 1 addition, 0 deletions

src/hardware/hw_light.c
src/info.c 8 additions, 0 deletions

src/info.c
src/info.h 8 additions, 0 deletions

src/info.h
src/p_user.c 10 additions, 0 deletions

src/p_user.c

with 34 additions and 0 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