Merge remote-tracking branch 'public-gl/next' into 2122-version (c0a0c5ac) · 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

c0a0c5ac

Commit c0a0c5ac authored 6 years ago by Marco Z

Downloads
- Plain Diff

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

parents e3d106d5 140152c2

No related branches found

No related tags found

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

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/m_misc.c 4 additions, 0 deletions

src/m_misc.c
src/p_setup.c 16 additions, 20 deletions

src/p_setup.c
src/r_bsp.c 25 additions, 61 deletions

src/r_bsp.c
src/r_defs.h 1 addition, 0 deletions

src/r_defs.h
src/r_main.c 23 additions, 0 deletions

src/r_main.c
src/r_main.h 1 addition, 0 deletions

src/r_main.h
src/r_segs.c 37 additions, 4 deletions

src/r_segs.c
src/sdl/Srb2SDL-vc10.vcxproj 1 addition, 1 deletion

src/sdl/Srb2SDL-vc10.vcxproj
src/sdl/i_video.c 4 additions, 1 deletion

src/sdl/i_video.c
src/tables.c 9 additions, 0 deletions

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

src/tables.h
src/win32/Srb2win-vc10.vcxproj 1 addition, 1 deletion

src/win32/Srb2win-vc10.vcxproj

with 124 additions and 88 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