Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks (f2596ab0) · Commits · santiago azael / 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

f2596ab0

Commit f2596ab0 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks

# Conflicts:
#	extras/conf/SRB2-22.cfg

parents fcf05c72 d7480f20

Loading

Changes 22

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 54 additions, 26 deletions

extras/conf/SRB2-22.cfg
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/dehacked.c 7 additions, 3 deletions

src/dehacked.c
src/hardware/hw_light.c 6 additions, 2 deletions

src/hardware/hw_light.c
src/info.c 71 additions, 37 deletions

src/info.c
src/info.h 9 additions, 1 deletion

src/info.h
src/lua_script.c 2 additions, 2 deletions

src/lua_script.c
src/m_menu.c 52 additions, 14 deletions

src/m_menu.c
src/m_misc.c 1 addition, 1 deletion

src/m_misc.c
src/p_enemy.c 1 addition, 1 deletion

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

src/p_inter.c
src/p_maputl.c 4 additions, 4 deletions

src/p_maputl.c
src/p_mobj.c 26 additions, 4 deletions

src/p_mobj.c
src/p_spec.c 25 additions, 22 deletions

src/p_spec.c
src/p_user.c 46 additions, 34 deletions

src/p_user.c
src/r_data.c 201 additions, 159 deletions

src/r_data.c
src/r_data.h 3 additions, 4 deletions

src/r_data.h
src/r_defs.h 3 additions, 3 deletions

src/r_defs.h
src/r_plane.c 50 additions, 12 deletions

src/r_plane.c
src/screen.h 0 additions, 5 deletions

src/screen.h

with 584 additions and 337 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