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

da7cdd92

Commit da7cdd92 authored 4 years ago by candelavla

Downloads
- Plain Diff

Merge remote-tracking branch 'stjr/next' into dashaction

parents f79ded7c 760e083c

No related branches found

No related tags found

Loading

Changes 62

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/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 1 addition, 1 deletion

src/d_player.h
src/deh_tables.c 32 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_draw.c 2 additions, 2 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 19 additions, 19 deletions

src/hardware/hw_main.c

with 159 additions and 200 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