Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs (5d343f9c) · 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

5d343f9c

Commit 5d343f9c authored 3 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs

# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h

parents 5e7547b8 323cfaac

No related branches found

No related tags found

Loading

Changes 48

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 256 additions, 22 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_common.cfg 2 additions, 2 deletions

extras/conf/udb/Includes/SRB222_common.cfg
extras/conf/udb/Includes/SRB222_linedefs.cfg 210 additions, 7 deletions

extras/conf/udb/Includes/SRB222_linedefs.cfg
extras/conf/udb/Includes/SRB222_misc.cfg 71 additions, 3 deletions

extras/conf/udb/Includes/SRB222_misc.cfg
src/b_bot.c 7 additions, 2 deletions

src/b_bot.c
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/deh_lua.c 5 additions, 0 deletions

src/deh_lua.c
src/deh_tables.c 23 additions, 6 deletions

src/deh_tables.c
src/doomdata.h 1 addition, 1 deletion

src/doomdata.h
src/g_game.c 27 additions, 24 deletions

src/g_game.c
src/g_input.c 33 additions, 27 deletions

src/g_input.c
src/hardware/hw_draw.c 22 additions, 38 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 70 additions, 31 deletions

src/hardware/hw_main.c
src/hu_stuff.c 22 additions, 18 deletions

src/hu_stuff.c
src/info.c 5 additions, 5 deletions

src/info.c
src/lua_hooklib.c 1 addition, 1 deletion

src/lua_hooklib.c
src/lua_maplib.c 8 additions, 0 deletions

src/lua_maplib.c
src/lua_mathlib.c 7 additions, 0 deletions

src/lua_mathlib.c
src/m_menu.c 21 additions, 22 deletions

src/m_menu.c
src/p_floor.c 2 additions, 2 deletions

src/p_floor.c

with 794 additions and 212 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