Merge branch 'next-lc-uint16' into 'next' (f0b64971) · Commits · STJr / SRB2 · GitLab

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

f0b64971

Commit f0b64971 authored 4 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'next-lc-uint16' into 'next'

Custom skincolors

See merge request !960

parents 97cf90b9 f508f5b8

No related branches found

No related tags found

2 merge requests!985Shaders next merge,!960Custom skincolors

Changes 46

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 2 additions, 2 deletions

src/d_clisrv.c
src/d_clisrv.h 3 additions, 3 deletions

src/d_clisrv.h
src/d_main.c 4 additions, 0 deletions

src/d_main.c
src/d_netcmd.c 68 additions, 45 deletions

src/d_netcmd.c
src/d_player.h 1 addition, 1 deletion

src/d_player.h
src/dehacked.c 165 additions, 26 deletions

src/dehacked.c
src/djgppdos/i_system.c 4 additions, 0 deletions

src/djgppdos/i_system.c
src/doomdata.h 0 additions, 4 deletions

src/doomdata.h
src/doomdef.h 27 additions, 7 deletions

src/doomdef.h
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_demo.c 50 additions, 33 deletions

src/g_demo.c
src/g_game.c 7 additions, 7 deletions

src/g_game.c
src/g_state.h 2 additions, 1 deletion

src/g_state.h
src/hardware/hw_md2.c 9 additions, 9 deletions

src/hardware/hw_md2.c
src/hu_stuff.c 34 additions, 107 deletions

src/hu_stuff.c
src/info.c 157 additions, 2 deletions

src/info.c
src/lua_baselib.c 50 additions, 4 deletions

src/lua_baselib.c
src/lua_hudlib.c 5 additions, 5 deletions

src/lua_hudlib.c
src/lua_infolib.c 261 additions, 0 deletions

src/lua_infolib.c

with 851 additions and 258 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