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

c4775ed3

Commit c4775ed3 authored 3 years ago by MascaraSnake

Downloads
- Plain Diff

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

# Conflicts:
#	extras/conf/SRB2-22.cfg
#	src/p_ceilng.c

parents bfc13c25 adce4272

No related branches found

No related tags found

Loading

Changes 59

Expand all Hide whitespace changes

Inline Side-by-side

Showing

debian-template/rules 1 addition, 1 deletion

debian-template/rules
extras/conf/SRB2-22.cfg 4 additions, 5 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_linedefs.cfg 0 additions, 6 deletions

extras/conf/udb/Includes/SRB222_linedefs.cfg
src/Makefile.d/versions.mk 0 additions, 2 deletions

src/Makefile.d/versions.mk
src/Makefile.d/win32.mk 5 additions, 0 deletions

src/Makefile.d/win32.mk
src/console.c 13 additions, 0 deletions

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

src/console.h
src/d_clisrv.c 463 additions, 163 deletions

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

src/d_clisrv.h
src/d_main.c 70 additions, 48 deletions

src/d_main.c
src/d_net.c 2 additions, 0 deletions

src/d_net.c
src/d_netcmd.c 34 additions, 21 deletions

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

src/d_netcmd.h
src/d_netfil.c 173 additions, 117 deletions

src/d_netfil.c
src/d_netfil.h 21 additions, 6 deletions

src/d_netfil.h
src/deh_tables.c 4 additions, 6 deletions

src/deh_tables.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/f_finale.c 4 additions, 4 deletions

src/f_finale.c
src/filesrch.c 11 additions, 4 deletions

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

src/filesrch.h

with 831 additions and 387 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