Merge remote-tracking branch 'origin/next' into rotsprite2 (c0390f51) · 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

c0390f51

Commit c0390f51 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into rotsprite2

parents 6779c508 aa9cc6e6

No related branches found

No related tags found

Loading

Changes 58

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 20 additions, 12 deletions

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

src/d_main.c
src/d_net.h 2 additions, 0 deletions

src/d_net.h
src/d_netcmd.c 55 additions, 15 deletions

src/d_netcmd.c
src/dehacked.c 437 additions, 163 deletions

src/dehacked.c
src/dehacked.h 1 addition, 1 deletion

src/dehacked.h
src/doomdef.h 5 additions, 0 deletions

src/doomdef.h
src/doomstat.h 87 additions, 25 deletions

src/doomstat.h
src/f_finale.c 9 additions, 5 deletions

src/f_finale.c
src/f_finale.h 6 additions, 1 deletion

src/f_finale.h
src/f_wipe.c 190 additions, 44 deletions

src/f_wipe.c
src/g_game.c 424 additions, 102 deletions

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

src/g_game.h
src/hardware/hw_cache.c 36 additions, 32 deletions

src/hardware/hw_cache.c
src/hardware/hw_defs.h 1 addition, 1 deletion

src/hardware/hw_defs.h
src/hardware/hw_glob.h 0 additions, 1 deletion

src/hardware/hw_glob.h
src/hardware/hw_md2.c 1 addition, 1 deletion

src/hardware/hw_md2.c
src/hu_stuff.c 20 additions, 20 deletions

src/hu_stuff.c
src/i_system.h 0 additions, 4 deletions

src/i_system.h
src/i_tcp.c 23 additions, 12 deletions

src/i_tcp.c

with 1349 additions and 447 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