Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into hotfix-pltz (ba71a7ee) · 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

ba71a7ee

Commit ba71a7ee authored 9 years ago by Yukita Mayako

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into hotfix-pltz

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

parents 9a9025b1 aa7c6713

No related branches found

No related tags found

No related merge requests found

Changes 48

Hide whitespace changes

Inline Side-by-side

Showing

SRB2.cbp 53 additions, 166 deletions

SRB2.cbp
cmake/Modules/FindSDL2.cmake 0 additions, 1 deletion

cmake/Modules/FindSDL2.cmake
src/b_bot.c 2 additions, 2 deletions

src/b_bot.c
src/d_main.c 3 additions, 3 deletions

src/d_main.c
src/d_netcmd.c 23 additions, 3 deletions

src/d_netcmd.c
src/dehacked.c 85 additions, 55 deletions

src/dehacked.c
src/doomdef.h 9 additions, 7 deletions

src/doomdef.h
src/g_game.c 27 additions, 26 deletions

src/g_game.c
src/hardware/hw_main.c 197 additions, 222 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 41 additions, 57 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 7 additions, 0 deletions

src/hardware/r_opengl/r_opengl.c
src/info.c 79 additions, 68 deletions

src/info.c
src/info.h 75 additions, 56 deletions

src/info.h
src/lua_baselib.c 6 additions, 2 deletions

src/lua_baselib.c
src/lua_hudlib.c 0 additions, 15 deletions

src/lua_hudlib.c
src/lua_infolib.c 48 additions, 0 deletions

src/lua_infolib.c
src/lua_maplib.c 0 additions, 10 deletions

src/lua_maplib.c
src/lua_mobjlib.c 1 addition, 1 deletion

src/lua_mobjlib.c
src/m_cheat.c 39 additions, 1 deletion

src/m_cheat.c
src/m_menu.c 22 additions, 28 deletions

src/m_menu.c

with 717 additions and 723 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