Merge branch 'next' into elevator-cleanup (790affd1) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

790affd1

Commit 790affd1 authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into elevator-cleanup

# Conflicts:
#	src/p_saveg.c

parents be0959fa ef5f8f3b

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 22 additions, 0 deletions

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

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

src/d_netcmd.c
src/lua_hudlib.c 3 additions, 3 deletions

src/lua_hudlib.c
src/lua_script.c 2 additions, 10 deletions

src/lua_script.c
src/m_menu.c 7 additions, 4 deletions

src/m_menu.c
src/p_saveg.c 298 additions, 298 deletions

src/p_saveg.c
src/p_spec.c 52 additions, 35 deletions

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

src/p_spec.h
src/sdl/i_video.c 3 additions, 1 deletion

src/sdl/i_video.c
src/w_wad.c 117 additions, 3 deletions

src/w_wad.c
src/w_wad.h 4 additions, 0 deletions

src/w_wad.h

with 511 additions and 355 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