Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next (eef30281) · Commits · Hanicef / SRB2Classic · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2Classic
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Package Registry
- Terraform modules

Snippets Groups Projects

eef30281

Commit eef30281 authored 4 years ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next

# Conflicts:
#	src/dehacked.c
#	src/dehacked.h

parents ecb33351 ab649e85

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/blua/liolib.c 5 additions, 1 deletion

src/blua/liolib.c
src/deh_lua.c 9 additions, 0 deletions

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

src/deh_lua.h
src/deh_tables.c 3 additions, 4 deletions

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

src/deh_tables.h
src/info.h 270 additions, 0 deletions

src/info.h
src/lua_consolelib.c 14 additions, 3 deletions

src/lua_consolelib.c
src/lua_hudlib.c 25 additions, 15 deletions

src/lua_hudlib.c
src/lua_infolib.c 20 additions, 16 deletions

src/lua_infolib.c
src/lua_script.c 20 additions, 2 deletions

src/lua_script.c
src/lua_script.h 1 addition, 8 deletions

src/lua_script.h
src/p_enemy.c 261 additions, 261 deletions

src/p_enemy.c

with 631 additions and 310 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