Merge branch 'fury-gh/slopes' into angles (923fae47) · 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

923fae47

Commit 923fae47 authored 9 years ago by RedEnchilada

Downloads
- Plain Diff

Merge branch 'fury-gh/slopes' into angles

Conflicts:
	src/p_maputl.c

parents f7c46341 54f0d0c1

No related branches found

No related tags found

1 merge request!22Slopes and stuff

Changes 20

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 2 additions, 0 deletions

src/Makefile
src/doomdef.h 8 additions, 0 deletions

src/doomdef.h
src/m_fixed.h 23 additions, 0 deletions

src/m_fixed.h
src/m_vector.c 1160 additions, 0 deletions

src/m_vector.c
src/m_vector.h 123 additions, 0 deletions

src/m_vector.h
src/p_enemy.c 13 additions, 0 deletions

src/p_enemy.c
src/p_floor.c 10 additions, 1 deletion

src/p_floor.c
src/p_local.h 15 additions, 0 deletions

src/p_local.h
src/p_map.c 309 additions, 62 deletions

src/p_map.c
src/p_maputl.c 164 additions, 44 deletions

src/p_maputl.c
src/p_mobj.c 91 additions, 12 deletions

src/p_mobj.c
src/p_mobj.h 10 additions, 0 deletions

src/p_mobj.h
src/p_slopes.c 1211 additions, 0 deletions

src/p_slopes.c
src/p_slopes.h 84 additions, 0 deletions

src/p_slopes.h
src/p_spec.c 84 additions, 6 deletions

src/p_spec.c
src/p_spec.h 5 additions, 0 deletions

src/p_spec.h
src/p_user.c 81 additions, 0 deletions

src/p_user.c
src/r_defs.h 54 additions, 0 deletions

src/r_defs.h
src/tables.c 2 additions, 3 deletions

src/tables.c
src/tables.h 2 additions, 3 deletions

src/tables.h

with 3451 additions and 131 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