Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray (70512f11) · 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

70512f11

"README.md" did not exist on "7cf1a1aab8bc041f8fb1c95a0aa8beb8d06db84e"

Commit 70512f11 authored 4 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray

# Conflicts:
#	src/p_floor.c
#	src/p_spec.c

parents 7dd83285 072e1889

No related branches found

No related tags found

Loading

Changes 26

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 0 deletions

src/Makefile
src/doomdata.h 2 additions, 2 deletions

src/doomdata.h
src/hardware/hw_main.c 27 additions, 3 deletions

src/hardware/hw_main.c
src/lua_baselib.c 1 addition, 0 deletions

src/lua_baselib.c
src/lua_maplib.c 3 additions, 13 deletions

src/lua_maplib.c
src/lua_mobjlib.c 2 additions, 2 deletions

src/lua_mobjlib.c
src/m_cheat.c 0 additions, 1 deletion

src/m_cheat.c
src/p_ceilng.c 8 additions, 4 deletions

src/p_ceilng.c
src/p_enemy.c 6 additions, 5 deletions

src/p_enemy.c
src/p_floor.c 45 additions, 27 deletions

src/p_floor.c
src/p_inter.c 1 addition, 1 deletion

src/p_inter.c
src/p_lights.c 3 additions, 1 deletion

src/p_lights.c
src/p_mobj.c 40 additions, 36 deletions

src/p_mobj.c
src/p_polyobj.c 8 additions, 6 deletions

src/p_polyobj.c
src/p_saveg.c 28 additions, 15 deletions

src/p_saveg.c
src/p_setup.c 114 additions, 70 deletions

src/p_setup.c
src/p_slopes.c 6 additions, 9 deletions

src/p_slopes.c
src/p_spec.c 160 additions, 279 deletions

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

src/p_spec.h

with 457 additions and 478 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