Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more (65054bd0) · 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

65054bd0

Commit 65054bd0 authored 4 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more

parents 37d2796b 8063814f

No related branches found

No related tags found

No related merge requests found

Changes 130

Expand all Hide whitespace changes

Inline Side-by-side

Showing

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

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 3 deletions

src/Makefile
src/am_map.c 2 additions, 5 deletions

src/am_map.c
src/blua/lbaselib.c 26 additions, 0 deletions

src/blua/lbaselib.c
src/blua/liolib.c 15 additions, 10 deletions

src/blua/liolib.c
src/console.c 1 addition, 4 deletions

src/console.c
src/d_clisrv.c 601 additions, 80 deletions

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

src/d_clisrv.h
src/d_main.c 95 additions, 4 deletions

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

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

src/d_netcmd.c
src/d_netfil.c 483 additions, 140 deletions

src/d_netfil.c
src/d_netfil.h 26 additions, 11 deletions

src/d_netfil.h
src/d_player.h 4 additions, 1 deletion

src/d_player.h
src/dehacked.c 217 additions, 38 deletions

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

src/djgppdos/i_system.c
src/djgppdos/i_video.c 3 additions, 0 deletions

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

src/doomdata.h
src/doomdef.h 31 additions, 18 deletions

src/doomdef.h

with 1656 additions and 381 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