Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor (c33d8b3b) · Commits · Jaden / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

c33d8b3b

Commit c33d8b3b authored 3 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor

parents b4fa98d2 db92f31f

No related branches found

No related tags found

No related merge requests found

Changes 77

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 16 additions, 0 deletions

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

src/CMakeLists.txt
src/Makefile 1 addition, 1 deletion

src/Makefile
src/Makefile.d/detect.mk 8 additions, 4 deletions

src/Makefile.d/detect.mk
src/am_map.c 3 additions, 3 deletions

src/am_map.c
src/b_bot.c 132 additions, 106 deletions

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

src/b_bot.h
src/blua/lbaselib.c 1 addition, 1 deletion

src/blua/lbaselib.c
src/command.c 8 additions, 3 deletions

src/command.c
src/console.c 7 additions, 7 deletions

src/console.c
src/d_clisrv.c 202 additions, 70 deletions

src/d_clisrv.c
src/d_clisrv.h 17 additions, 12 deletions

src/d_clisrv.h
src/d_event.h 4 additions, 3 deletions

src/d_event.h
src/d_main.c 41 additions, 21 deletions

src/d_main.c
src/d_netcmd.c 250 additions, 8 deletions

src/d_netcmd.c
src/d_netcmd.h 7 additions, 7 deletions

src/d_netcmd.h
src/d_netfil.c 43 additions, 8 deletions

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

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

src/d_player.h
src/deh_tables.c 49 additions, 43 deletions

src/deh_tables.c

with 838 additions and 300 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