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

ee75cbba

Commit ee75cbba authored 8 years ago by Sal

Downloads
- Plain Diff

Merge remote-tracking branch 'refs/remotes/upstream/next' into next

parents cce2a5e0 405237d3

Branches

Tags

2 merge requests!488Merge in next and don't billboard papersprites in GL,!387Lua: Expose R_TextureNumForName

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

README.md 22 additions, 0 deletions

README.md
readme.txt 0 additions, 155 deletions

readme.txt
src/doomdef.h 1 addition, 0 deletions

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

src/g_game.c
src/i_tcp.c 3 additions, 1 deletion

src/i_tcp.c
src/m_misc.c 2 additions, 0 deletions

src/m_misc.c
src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_mobj.c 37 additions, 46 deletions

src/p_mobj.c
src/p_spec.c 2 additions, 2 deletions

src/p_spec.c
src/p_user.c 30 additions, 22 deletions

src/p_user.c
src/st_stuff.c 1 addition, 1 deletion

src/st_stuff.c

with 100 additions and 229 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