Merge branch 'udmf-next' into udmf-fofs-mkii (e00531ed) · 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

e00531ed

Commit e00531ed authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'udmf-next' into udmf-fofs-mkii

# Conflicts:
#	src/p_floor.c
#	src/p_spec.c
#	src/p_spec.h

parents b439fa2b 04c10ed4

No related branches found

No related tags found

Loading

Changes 40

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 4 additions, 1 deletion

extras/conf/SRB2-22.cfg
src/command.c 1 addition, 1 deletion

src/command.c
src/d_clisrv.h 3 additions, 6 deletions

src/d_clisrv.h
src/d_main.c 45 additions, 6 deletions

src/d_main.c
src/dehacked.c 24 additions, 1 deletion

src/dehacked.c
src/doomdata.h 10 additions, 1 deletion

src/doomdata.h
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/doomstat.h 2 additions, 0 deletions

src/doomstat.h
src/f_finale.c 4 additions, 2 deletions

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

src/g_game.c
src/hardware/hw_main.c 114 additions, 76 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 4 additions, 1 deletion

src/hardware/hw_md2.c
src/i_tcp.c 6 additions, 3 deletions

src/i_tcp.c
src/lua_baselib.c 3 additions, 0 deletions

src/lua_baselib.c
src/lua_infolib.c 0 additions, 1 deletion

src/lua_infolib.c
src/lua_libs.h 2 additions, 0 deletions

src/lua_libs.h
src/lua_mobjlib.c 90 additions, 0 deletions

src/lua_mobjlib.c
src/lua_script.c 2 additions, 2 deletions

src/lua_script.c
src/m_argv.c 19 additions, 0 deletions

src/m_argv.c
src/m_argv.h 3 additions, 0 deletions

src/m_argv.h

with 342 additions and 102 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