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

de3ad9bc

Commit de3ad9bc authored 4 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'udmf-next' into udmf-multitag

# Conflicts:
#	src/doomdata.h
#	src/p_setup.c

parents 5c605a8a 3d9d9d74

No related branches found

No related tags found

1 merge request!1097UDMF: Multitag support

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/doomdata.h 3 additions, 1 deletion

src/doomdata.h
src/lua_mobjlib.c 27 additions, 0 deletions

src/lua_mobjlib.c
src/p_mobj.c 13 additions, 7 deletions

src/p_mobj.c
src/p_mobj.h 2 additions, 2 deletions

src/p_mobj.h
src/p_saveg.c 9 additions, 1 deletion

src/p_saveg.c
src/p_setup.c 9 additions, 1 deletion

src/p_setup.c

with 63 additions and 12 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