Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements (d8065fa5) · 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

d8065fa5

Commit d8065fa5 authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements

# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/info.c
#	src/p_user.c

parents 94490623 9b152471

Loading

Changes 45

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 2 additions, 2 deletions

.travis.yml
src/blua/lvm.c 2 additions, 1 deletion

src/blua/lvm.c
src/command.c 4 additions, 2 deletions

src/command.c
src/d_clisrv.c 2 additions, 0 deletions

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

src/d_clisrv.h
src/d_main.h 1 addition, 1 deletion

src/d_main.h
src/d_player.h 3 additions, 0 deletions

src/d_player.h
src/dehacked.c 9 additions, 1 deletion

src/dehacked.c
src/doomdef.h 7 additions, 1 deletion

src/doomdef.h
src/f_finale.h 1 addition, 1 deletion

src/f_finale.h
src/hardware/hw_dll.h 1 addition, 1 deletion

src/hardware/hw_dll.h
src/hardware/hw_main.c 9 additions, 5 deletions

src/hardware/hw_main.c
src/hardware/r_opengl/r_opengl.c 12 additions, 6 deletions

src/hardware/r_opengl/r_opengl.c
src/hu_stuff.h 1 addition, 1 deletion

src/hu_stuff.h
src/info.c 4 additions, 0 deletions

src/info.c
src/info.h 4 additions, 0 deletions

src/info.h
src/lua_baselib.c 11 additions, 0 deletions

src/lua_baselib.c
src/lua_playerlib.c 4 additions, 0 deletions

src/lua_playerlib.c
src/p_floor.c 6 additions, 6 deletions

src/p_floor.c
src/p_inter.c 1 addition, 1 deletion

src/p_inter.c

with 85 additions and 29 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