Merge branch 'next' into udmf-next (5c8b50ca) · 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

5c8b50ca

Commit 5c8b50ca authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into udmf-next

# Conflicts:
#	src/p_saveg.c
#	src/p_slopes.c
#	src/p_spec.c

parents 04c10ed4 2449c66b

No related branches found

No related tags found

1 merge request!1075Merge udmf-next into next

Changes 15

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_ceilng.c 2 additions, 2 deletions

src/p_ceilng.c
src/p_floor.c 120 additions, 130 deletions

src/p_floor.c
src/p_map.c 3 additions, 5 deletions

src/p_map.c
src/p_saveg.c 361 additions, 703 deletions

src/p_saveg.c
src/p_spec.c 128 additions, 167 deletions

src/p_spec.c
src/p_spec.h 27 additions, 4 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 801 additions and 1033 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