Merge branch 'next' into udmf-next (4745264a) · 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

4745264a

Commit 4745264a authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'next' into udmf-next

# Conflicts:
#	src/p_slopes.c

parents 63adb235 661c44b2

No related branches found

No related tags found

1 merge request!1075Merge udmf-next into next

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/lua_maplib.c 21 additions, 1 deletion

src/lua_maplib.c
src/p_setup.c 16 additions, 2 deletions

src/p_setup.c
src/p_slopes.c 59 additions, 5 deletions

src/p_slopes.c
src/p_slopes.h 1 addition, 1 deletion

src/p_slopes.h
src/p_spec.c 1 addition, 1 deletion

src/p_spec.c
src/r_defs.h 2 additions, 0 deletions

src/r_defs.h

with 100 additions and 10 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