Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles (2fb03a7c) · 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

2fb03a7c

Commit 2fb03a7c authored 9 years ago by Yukita Mayako

Downloads
- Plain Diff

Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles

Conflicts:
	src/p_map.c - Automatically resolved by mergetool

parents 96c71c68 14bb811d

No related branches found

No related tags found

Loading

Changes 24

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/blua/luaconf.h 15 additions, 8 deletions

src/blua/luaconf.h
src/d_main.c 8 additions, 0 deletions

src/d_main.c
src/dehacked.c 35 additions, 31 deletions

src/dehacked.c
src/lua_baselib.c 84 additions, 92 deletions

src/lua_baselib.c
src/lua_hook.h 5 additions, 4 deletions

src/lua_hook.h
src/lua_hooklib.c 474 additions, 707 deletions

src/lua_hooklib.c
src/lua_hudlib.c 0 additions, 4 deletions

src/lua_hudlib.c
src/lua_infolib.c 9 additions, 11 deletions

src/lua_infolib.c
src/lua_maplib.c 70 additions, 15 deletions

src/lua_maplib.c
src/lua_mathlib.c 17 additions, 17 deletions

src/lua_mathlib.c
src/lua_mobjlib.c 35 additions, 34 deletions

src/lua_mobjlib.c
src/lua_playerlib.c 41 additions, 41 deletions

src/lua_playerlib.c
src/lua_script.c 10 additions, 11 deletions

src/lua_script.c
src/lua_script.h 13 additions, 0 deletions

src/lua_script.h
src/lua_skinlib.c 6 additions, 6 deletions

src/lua_skinlib.c
src/p_enemy.c 19 additions, 12 deletions

src/p_enemy.c
src/p_inter.c 2 additions, 2 deletions

src/p_inter.c
src/p_local.h 2 additions, 2 deletions

src/p_local.h
src/p_map.c 22 additions, 21 deletions

src/p_map.c
src/p_mobj.c 43 additions, 66 deletions

src/p_mobj.c

with 910 additions and 1084 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