Merge remote-tracking branch 'origin/next' into pictureformats (f4a976f3) · 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

f4a976f3

Commit f4a976f3 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into pictureformats

parents c1acdfe5 a7770c3e

No related branches found

No related tags found

Loading

Changes 52

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 1 addition, 8 deletions

src/command.c
src/console.c 36 additions, 29 deletions

src/console.c
src/d_clisrv.c 32 additions, 85 deletions

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

src/d_clisrv.h
src/d_main.c 7 additions, 10 deletions

src/d_main.c
src/d_netcmd.c 18 additions, 116 deletions

src/d_netcmd.c
src/dehacked.c 18 additions, 6 deletions

src/dehacked.c
src/doomdef.h 4 additions, 2 deletions

src/doomdef.h
src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/f_finale.c 1 addition, 0 deletions

src/f_finale.c
src/g_game.c 5 additions, 2 deletions

src/g_game.c
src/hardware/hw_clip.c 2 additions, 1 deletion

src/hardware/hw_clip.c
src/hardware/hw_main.c 77 additions, 32 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 2 additions, 2 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 286 additions, 215 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 17 additions, 21 deletions

src/hardware/r_opengl/r_opengl.c
src/hu_stuff.c 41 additions, 62 deletions

src/hu_stuff.c
src/info.c 46 additions, 18 deletions

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

src/info.h
src/lua_baselib.c 15 additions, 0 deletions

src/lua_baselib.c

with 614 additions and 612 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