Merge branch 'next' into udmf-next (4a0206b3) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

4a0206b3

Commit 4a0206b3 authored 4 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into udmf-next

# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c

parents 11493e61 191e2e09

No related branches found

No related tags found

No related merge requests found

Changes 83

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 44 additions, 13 deletions

extras/conf/SRB2-22.cfg
src/am_map.c 2 additions, 5 deletions

src/am_map.c
src/d_clisrv.c 38 additions, 64 deletions

src/d_clisrv.c
src/d_clisrv.h 9 additions, 6 deletions

src/d_clisrv.h
src/d_main.c 7 additions, 0 deletions

src/d_main.c
src/d_net.c 4 additions, 3 deletions

src/d_net.c
src/d_netcmd.c 68 additions, 45 deletions

src/d_netcmd.c
src/d_player.h 6 additions, 2 deletions

src/d_player.h
src/dehacked.c 170 additions, 30 deletions

src/dehacked.c
src/djgppdos/i_system.c 4 additions, 0 deletions

src/djgppdos/i_system.c
src/doomdata.h 0 additions, 4 deletions

src/doomdata.h
src/doomdef.h 27 additions, 11 deletions

src/doomdef.h
src/doomstat.h 14 additions, 1 deletion

src/doomstat.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/f_finale.h 2 additions, 0 deletions

src/f_finale.h
src/f_wipe.c 8 additions, 0 deletions

src/f_wipe.c
src/g_demo.c 151 additions, 126 deletions

src/g_demo.c
src/g_game.c 55 additions, 21 deletions

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

src/g_game.h
src/g_state.h 2 additions, 1 deletion

src/g_state.h

with 613 additions and 333 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