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

b49cf11f

Commit b49cf11f authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'public-gl/next' into 2122-version

parents 9d212b34 a72d79da

Branches

Tags

2 merge requests!488Merge in next and don't billboard papersprites in GL,!402Update code versions to 2.1.22

Changes 56

Hide whitespace changes

Inline Side-by-side

Showing

debian/rules 2 additions, 1 deletion

debian/rules
src/Makefile.cfg 1 addition, 3 deletions

src/Makefile.cfg
src/am_map.c 84 additions, 264 deletions

src/am_map.c
src/command.c 16 additions, 4 deletions

src/command.c
src/console.c 1 addition, 4 deletions

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

src/d_clisrv.h
src/d_main.c 2 additions, 6 deletions

src/d_main.c
src/d_net.c 4 additions, 3 deletions

src/d_net.c
src/d_netcmd.c 10 additions, 1 deletion

src/d_netcmd.c
src/dehacked.c 19 additions, 1 deletion

src/dehacked.c
src/doomstat.h 6 additions, 0 deletions

src/doomstat.h
src/f_finale.c 5 additions, 2 deletions

src/f_finale.c
src/g_game.c 30 additions, 14 deletions

src/g_game.c
src/g_game.h 2 additions, 2 deletions

src/g_game.h
src/g_input.c 23 additions, 0 deletions

src/g_input.c
src/hardware/hw_bsp.c 123 additions, 128 deletions

src/hardware/hw_bsp.c
src/hardware/hw_draw.c 6 additions, 18 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 25 additions, 5 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 0 additions, 1 deletion

src/hardware/hw_main.h
src/hardware/r_opengl/r_opengl.c 7 additions, 4 deletions

src/hardware/r_opengl/r_opengl.c

with 369 additions and 464 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