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

bea7ad21

Commit bea7ad21 authored 5 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/next' into viewroll

parents ec890156 ef53672d

No related branches found

No related tags found

Loading

Changes 34

Expand all Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 10 additions, 5 deletions

appveyor.yml
src/command.c 1 addition, 1 deletion

src/command.c
src/d_clisrv.c 201 additions, 118 deletions

src/d_clisrv.c
src/d_clisrv.h 4 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 7 additions, 1 deletion

src/d_main.c
src/d_netcmd.c 18 additions, 17 deletions

src/d_netcmd.c
src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/dehacked.c 6 additions, 5 deletions

src/dehacked.c
src/f_finale.c 1 addition, 0 deletions

src/f_finale.c
src/g_game.c 75 additions, 65 deletions

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

src/g_game.h
src/g_input.c 7 additions, 1 deletion

src/g_input.c
src/hardware/hw_main.c 81 additions, 199 deletions

src/hardware/hw_main.c
src/hu_stuff.c 7 additions, 7 deletions

src/hu_stuff.c
src/lua_baselib.c 3 additions, 3 deletions

src/lua_baselib.c
src/lua_consolelib.c 1 addition, 1 deletion

src/lua_consolelib.c
src/lua_hook.h 1 addition, 1 deletion

src/lua_hook.h
src/lua_hooklib.c 1 addition, 1 deletion

src/lua_hooklib.c
src/lua_playerlib.c 4 additions, 0 deletions

src/lua_playerlib.c
src/m_cheat.c 4 additions, 4 deletions

src/m_cheat.c

with 436 additions and 431 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