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

0fdfb1a4

Commit 0fdfb1a4 authored 8 years ago by Inuyasha

Downloads
- Plain Diff

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

# Conflicts:
#	src/p_pspr.h

parents afb22b96 22d772f0

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 5 additions, 1 deletion

src/dehacked.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hardware/hw_main.c 4 additions, 5 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 2 additions, 2 deletions

src/hardware/hw_md2.c
src/m_cheat.c 1 addition, 1 deletion

src/m_cheat.c
src/p_enemy.c 11 additions, 8 deletions

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

src/p_inter.c
src/p_map.c 94 additions, 0 deletions

src/p_map.c
src/p_mobj.c 14 additions, 23 deletions

src/p_mobj.c
src/p_mobj.h 5 additions, 4 deletions

src/p_mobj.h
src/p_pspr.h 4 additions, 0 deletions

src/p_pspr.h
src/p_user.c 4 additions, 4 deletions

src/p_user.c
src/r_things.c 164 additions, 44 deletions

src/r_things.c
src/r_things.h 2 additions, 1 deletion

src/r_things.h

with 315 additions and 95 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