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

a44be495

Commit a44be495 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into nights-inufixes

parents c3e02670 28bbe71c

No related branches found

No related tags found

No related merge requests found

Changes 37

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/d_player.h 13 additions, 1 deletion

src/d_player.h
src/dehacked.c 9 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 23 additions, 15 deletions

src/g_game.c
src/hu_stuff.c 10 additions, 2 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/lua_playerlib.c 36 additions, 0 deletions

src/lua_playerlib.c
src/m_cheat.c 58 additions, 31 deletions

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

src/m_cheat.h
src/m_menu.c 3 additions, 3 deletions

src/m_menu.c
src/p_inter.c 4 additions, 8 deletions

src/p_inter.c
src/p_map.c 16 additions, 5 deletions

src/p_map.c
src/p_saveg.c 18 additions, 0 deletions

src/p_saveg.c

with 246 additions and 115 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