Merge branch 'next' into 'fix-spawn-desynch' (e2b860dc) · Commits · Toby Games / 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

e2b860dc

Commit e2b860dc authored 4 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'next' into 'fix-spawn-desynch'

# Conflicts:
#   src/p_map.c

parents c6e13d0e b13f2985

No related branches found

No related tags found

Loading

Changes 56

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 25 additions, 7 deletions

extras/conf/SRB2-22.cfg
src/d_clisrv.c 28 additions, 23 deletions

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

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

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

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

src/d_netcmd.c
src/d_player.h 1 addition, 1 deletion

src/d_player.h
src/dehacked.c 165 additions, 26 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, 7 deletions

src/doomdef.h
src/doomstat.h 1 addition, 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 50 additions, 33 deletions

src/g_demo.c
src/g_game.c 9 additions, 7 deletions

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

src/g_state.h
src/hardware/hw_main.c 11 additions, 10 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 9 additions, 9 deletions

src/hardware/hw_md2.c

with 427 additions and 183 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