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

b8d40a57

Commit b8d40a57 authored 5 years ago by James R.

Downloads
- Plain Diff

Merge branch 'dye' into 'next'

Expose colorization to mappers and SOC

See merge request STJr/SRB2!679

parents 78613ec4 380b2f87

No related branches found

No related tags found

2 merge requests!985Shaders next merge,!679Expose colorization to mappers and SOC

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 4 additions, 3 deletions

src/d_netcmd.c
src/d_player.h 3 additions, 0 deletions

src/d_player.h
src/dehacked.c 6 additions, 1 deletion

src/dehacked.c
src/info.h 1 addition, 0 deletions

src/info.h
src/p_enemy.c 37 additions, 0 deletions

src/p_enemy.c
src/p_setup.c 4 additions, 0 deletions

src/p_setup.c
src/p_spec.c 37 additions, 2 deletions

src/p_spec.c
src/p_user.c 7 additions, 1 deletion

src/p_user.c
src/st_stuff.c 15 additions, 5 deletions

src/st_stuff.c

with 114 additions and 12 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