Merge branch 'colors-ultimate' into 'next' (8ce03284) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

8ce03284

Commit 8ce03284 authored 1 year ago by sphere

Downloads
- Plain Diff

Merge branch 'colors-ultimate' into 'next'

Colors Ultimate

Closes #745 and #496

See merge request STJr/SRB2!2027

parents 6f74123c 867a5e0d

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/deh_tables.c 49 additions, 4 deletions

src/deh_tables.c
src/doomdef.h 46 additions, 1 deletion

src/doomdef.h
src/info.c 69 additions, 24 deletions

src/info.c
src/m_menu.c 200 additions, 43 deletions

src/m_menu.c
src/m_menu.h 2 additions, 0 deletions

src/m_menu.h
src/p_enemy.c 1 addition, 1 deletion

src/p_enemy.c
src/p_inter.c 8 additions, 31 deletions

src/p_inter.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_user.c 1 addition, 1 deletion

src/p_user.c
src/st_stuff.c 10 additions, 33 deletions

src/st_stuff.c
src/st_stuff.h 3 additions, 0 deletions

src/st_stuff.h

with 390 additions and 139 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