Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator (b642682d) · 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

b642682d

Commit b642682d authored 4 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator

# Conflicts:
#	src/doomtype.h

parents d0f3a6d7 98e67871

No related branches found

No related tags found

1 merge request!1292Lua multitagging

Changes 74

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 1 addition, 89 deletions

src/Makefile
src/Makefile.cfg 2 additions, 2 deletions

src/Makefile.cfg
src/blua/lcode.c 12 additions, 19 deletions

src/blua/lcode.c
src/console.c 39 additions, 21 deletions

src/console.c
src/d_clisrv.c 26 additions, 23 deletions

src/d_clisrv.c
src/d_main.c 8 additions, 12 deletions

src/d_main.c
src/d_netcmd.c 12 additions, 13 deletions

src/d_netcmd.c
src/d_netcmd.h 0 additions, 2 deletions

src/d_netcmd.h
src/d_player.h 3 additions, 1 deletion

src/d_player.h
src/deh_tables.c 40 additions, 4 deletions

src/deh_tables.c
src/dehacked.c 6 additions, 0 deletions

src/dehacked.c
src/doomdef.h 0 additions, 3 deletions

src/doomdef.h
src/doomtype.h 4 additions, 0 deletions

src/doomtype.h
src/f_finale.c 2 additions, 0 deletions

src/f_finale.c
src/g_demo.c 0 additions, 2 deletions

src/g_demo.c
src/g_game.c 27 additions, 2 deletions

src/g_game.c
src/g_game.h 0 additions, 2 deletions

src/g_game.h
src/hardware/hw_batching.c 4 additions, 4 deletions

src/hardware/hw_batching.c
src/hardware/hw_batching.h 1 addition, 1 deletion

src/hardware/hw_batching.h
src/hardware/hw_cache.c 59 additions, 14 deletions

src/hardware/hw_cache.c

with 246 additions and 214 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