Merge remote-tracking branch 'origin/master' into nightsplus-laplogic (dc86fe9b) · 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

dc86fe9b

Commit dc86fe9b authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into nightsplus-laplogic

parents 0c8e2ffd e0601616

No related branches found

No related tags found

No related merge requests found

Changes 32

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 0 additions, 43 deletions

.travis.yml
src/android/i_cdmus.c 1 addition, 1 deletion

src/android/i_cdmus.c
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/dehacked.c 6 additions, 0 deletions

src/dehacked.c
src/djgppdos/i_cdmus.c 1 addition, 1 deletion

src/djgppdos/i_cdmus.c
src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/g_game.c 21 additions, 15 deletions

src/g_game.c
src/hu_stuff.c 8 additions, 0 deletions

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

src/hu_stuff.h
src/info.c 30 additions, 0 deletions

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

src/info.h
src/lua_maplib.c 17 additions, 2 deletions

src/lua_maplib.c
src/m_cheat.c 57 additions, 30 deletions

src/m_cheat.c
src/m_cheat.h 1 addition, 2 deletions

src/m_cheat.h
src/p_inter.c 1 addition, 7 deletions

src/p_inter.c
src/p_setup.c 1 addition, 0 deletions

src/p_setup.c
src/p_spec.c 3 additions, 3 deletions

src/p_spec.c
src/p_user.c 25 additions, 2 deletions

src/p_user.c
src/r_data.c 11 additions, 11 deletions

src/r_data.c
src/r_plane.c 13 additions, 2 deletions

src/r_plane.c

with 202 additions and 120 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