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

b4aa5cec

Commit b4aa5cec authored 5 years ago by Hannu Hanhi

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/next' into ogl-linkdraw

parents b29873ce de8019f1

No related branches found

No related tags found

1 merge request!1031MF2_LINKDRAW support for OpenGL

Changes 47

Show whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 21 additions, 30 deletions

src/d_clisrv.c
src/d_clisrv.h 1 addition, 1 deletion

src/d_clisrv.h
src/d_netcmd.c 1 addition, 0 deletions

src/d_netcmd.c
src/d_netfil.c 3 additions, 3 deletions

src/d_netfil.c
src/d_netfil.h 1 addition, 1 deletion

src/d_netfil.h
src/d_player.h 4 additions, 0 deletions

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

src/dehacked.c
src/doomdef.h 0 additions, 5 deletions

src/doomdef.h
src/f_finale.c 6 additions, 3 deletions

src/f_finale.c
src/g_game.c 88 additions, 66 deletions

src/g_game.c
src/g_game.h 1 addition, 1 deletion

src/g_game.h
src/hardware/hw_drv.h 1 addition, 1 deletion

src/hardware/hw_drv.h
src/hardware/hw_light.c 3 additions, 0 deletions

src/hardware/hw_light.c
src/hardware/hw_main.c 6 additions, 0 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 2 additions, 1 deletion

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 9 additions, 6 deletions

src/hardware/r_opengl/r_opengl.c
src/hu_stuff.c 2 additions, 2 deletions

src/hu_stuff.c
src/info.c 120 additions, 32 deletions

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

src/info.h
src/locale/en.po 1 addition, 1 deletion

src/locale/en.po

with 293 additions and 154 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