Merge branch 'lua-polyobjects' into 'next' (bd9fda8c) · Commits · Fancy2209 / 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

bd9fda8c

Commit bd9fda8c authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'lua-polyobjects' into 'next'

Lua polyobjects

Closes #19

See merge request STJr/SRB2!1140

parents 31977878 0f2e063d

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 1 addition, 0 deletions

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

src/blua/Makefile.cfg
src/dehacked.c 19 additions, 0 deletions

src/dehacked.c
src/lua_baselib.c 5 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
src/lua_polyobjlib.c 486 additions, 0 deletions

src/lua_polyobjlib.c
src/lua_script.c 24 additions, 0 deletions

src/lua_script.c
src/p_polyobj.c 2 additions, 2 deletions

src/p_polyobj.c
src/p_polyobj.h 2 additions, 0 deletions

src/p_polyobj.h
src/sdl/Srb2SDL-vc10.vcxproj 1 addition, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj
src/sdl/Srb2SDL-vc10.vcxproj.filters 3 additions, 0 deletions

src/sdl/Srb2SDL-vc10.vcxproj.filters

with 660 additions and 6 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