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

5614ff56

Commit 5614ff56 authored 8 years ago by toaster

Downloads
- Plain Diff

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

# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c

parents 664cfa2a 20555c88

No related branches found

No related tags found

No related merge requests found

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 165 additions, 204 deletions

src/dehacked.c
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hardware/hw_light.c 24 additions, 21 deletions

src/hardware/hw_light.c
src/hardware/hw_main.c 3 additions, 3 deletions

src/hardware/hw_main.c
src/info.c 911 additions, 430 deletions

src/info.c
src/info.h 191 additions, 225 deletions

src/info.h
src/p_enemy.c 198 additions, 98 deletions

src/p_enemy.c
src/p_inter.c 3 additions, 4 deletions

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

src/p_local.h
src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_mobj.c 116 additions, 101 deletions

src/p_mobj.c
src/p_user.c 1 addition, 1 deletion

src/p_user.c
src/r_plane.c 1 addition, 1 deletion

src/r_plane.c
src/sounds.c 1 addition, 0 deletions

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

src/sounds.h

with 1619 additions and 1090 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