Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge (da98ea24) · 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

da98ea24

Commit da98ea24 authored 4 years ago by Hannu Hanhi

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge

parents db32b012 28550b22

No related branches found

No related tags found

Loading

Changes 133

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 2 additions, 2 deletions

.circleci/config.yml
CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
extras/conf/SRB2-22.cfg 84 additions, 20 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 83 additions, 85 deletions

src/CMakeLists.txt
src/Makefile 2 additions, 5 deletions

src/Makefile
src/am_map.c 3 additions, 37 deletions

src/am_map.c
src/b_bot.c 13 additions, 4 deletions

src/b_bot.c
src/blua/Makefile.cfg 1 addition, 2 deletions

src/blua/Makefile.cfg
src/blua/linit.c 1 addition, 0 deletions

src/blua/linit.c
src/blua/liolib.c 635 additions, 0 deletions

src/blua/liolib.c
src/blua/lualib.h 3 additions, 0 deletions

src/blua/lualib.h
src/command.c 0 additions, 6 deletions

src/command.c
src/config.h.in 4 additions, 2 deletions

src/config.h.in
src/d_clisrv.c 134 additions, 87 deletions

src/d_clisrv.c
src/d_clisrv.h 14 additions, 8 deletions

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

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

src/d_net.c
src/d_netcmd.c 80 additions, 75 deletions

src/d_netcmd.c
src/d_netcmd.h 1 addition, 2 deletions

src/d_netcmd.h

with 1090 additions and 347 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