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

ffc161e2

Commit ffc161e2 authored 5 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'udmf-next' into udmf-multitag

# Conflicts:
#	src/p_spec.c

parents b7c4ed9c 2b2a18fd

Branches

Tags

1 merge request!1097UDMF: Multitag support

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/p_saveg.c 5 additions, 0 deletions

src/p_saveg.c
src/p_setup.c 164 additions, 4 deletions

src/p_setup.c
src/p_spec.c 121 additions, 80 deletions

src/p_spec.c
src/r_data.c 18 additions, 15 deletions

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

src/r_data.h
src/r_defs.h 1 addition, 0 deletions

src/r_defs.h

with 311 additions and 101 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