Merge remote-tracking branch 'STJrSRB2/master' into patch-1 (761a2218) · 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

761a2218

Commit 761a2218 authored 6 years ago by Golden

Downloads
- Plain Diff

Merge remote-tracking branch 'STJrSRB2/master' into patch-1

parents 7783ddd1 8c56e39c

No related branches found

No related tags found

1 merge request!488Merge in next and don't billboard papersprites in GL

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 2 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 1 addition, 15 deletions

src/d_main.c
src/d_netcmd.c 10 additions, 2 deletions

src/d_netcmd.c
src/hardware/hw_main.c 11 additions, 5 deletions

src/hardware/hw_main.c
src/lua_consolelib.c 3 additions, 1 deletion

src/lua_consolelib.c
src/m_fixed.c 3 additions, 1 deletion

src/m_fixed.c
src/m_menu.c 1 addition, 1 deletion

src/m_menu.c
src/p_setup.c 1 addition, 6 deletions

src/p_setup.c
src/sdl/i_video.c 8 additions, 0 deletions

src/sdl/i_video.c
src/st_stuff.c 5 additions, 5 deletions

src/st_stuff.c

with 45 additions and 39 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