Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro (374c19f9) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

374c19f9

Commit 374c19f9 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro

parents 7f8ec74c bd9fda8c

No related branches found

No related tags found

1 merge request!1187Turn the lua sector lines hack into a macro

Changes 39

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 0 deletions

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

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

src/blua/Makefile.cfg
src/command.c 112 additions, 8 deletions

src/command.c
src/command.h 14 additions, 1 deletion

src/command.h
src/d_clisrv.c 13 additions, 12 deletions

src/d_clisrv.c
src/d_main.c 6 additions, 0 deletions

src/d_main.c
src/d_netcmd.c 145 additions, 112 deletions

src/d_netcmd.c
src/dehacked.c 19 additions, 0 deletions

src/dehacked.c
src/g_game.c 2 additions, 2 deletions

src/g_game.c
src/hardware/hw_defs.h 37 additions, 0 deletions

src/hardware/hw_defs.h
src/hardware/hw_drv.h 5 additions, 7 deletions

src/hardware/hw_drv.h
src/hardware/hw_main.c 70 additions, 51 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 7 additions, 2 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 1 addition, 1 deletion

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 158 additions, 167 deletions

src/hardware/r_opengl/r_opengl.c
src/lua_baselib.c 18 additions, 0 deletions

src/lua_baselib.c
src/lua_blockmaplib.c 55 additions, 1 deletion

src/lua_blockmaplib.c
src/lua_libs.h 5 additions, 0 deletions

src/lua_libs.h
src/lua_maplib.c 56 additions, 3 deletions

src/lua_maplib.c

with 729 additions and 369 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