Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

4c6d2611

Commit 4c6d2611 authored 10 years ago by Luna

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 4bbffebd 1a52d54c

Branches

No related tags found

No related merge requests found

Changes 25

Hide whitespace changes

Inline Side-by-side

Showing

readme.txt 1 addition, 1 deletion

readme.txt
src/command.c 0 additions, 8 deletions

src/command.c
src/d_clisrv.c 16 additions, 5 deletions

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

src/d_clisrv.h
src/d_main.c 3 additions, 4 deletions

src/d_main.c
src/d_netcmd.c 32 additions, 5 deletions

src/d_netcmd.c
src/doomdef.h 3 additions, 3 deletions

src/doomdef.h
src/f_wipe.c 93 additions, 30 deletions

src/f_wipe.c
src/hardware/hw_main.c 39 additions, 10 deletions

src/hardware/hw_main.c
src/lua_hudlib.c 5 additions, 6 deletions

src/lua_hudlib.c
src/lua_playerlib.c 1 addition, 1 deletion

src/lua_playerlib.c
src/m_cond.c 3 additions, 3 deletions

src/m_cond.c
src/m_menu.c 14 additions, 7 deletions

src/m_menu.c
src/m_menu.h 1 addition, 1 deletion

src/m_menu.h
src/p_inter.c 1 addition, 0 deletions

src/p_inter.c
src/p_map.c 6 additions, 0 deletions

src/p_map.c
src/p_mobj.c 3 additions, 0 deletions

src/p_mobj.c
src/p_setup.c 158 additions, 226 deletions

src/p_setup.c
src/p_setup.h 0 additions, 1 deletion

src/p_setup.h
src/p_spec.c 112 additions, 29 deletions

src/p_spec.c

with 491 additions and 341 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