Merge remote-tracking branch 'origin/master' into texture-flats-optimization (ae838d48) · 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

ae838d48

Commit ae838d48 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into texture-flats-optimization

parents 809f79c9 b157c21a

No related branches found

No related tags found

No related merge requests found

Changes 71

Hide whitespace changes

Inline Side-by-side

Showing

assets/CMakeLists.txt 3 additions, 4 deletions

assets/CMakeLists.txt
extras/conf/SRB2-22.cfg 179 additions, 125 deletions

extras/conf/SRB2-22.cfg
src/Makefile 1 addition, 4 deletions

src/Makefile
src/command.c 188 additions, 56 deletions

src/command.c
src/config.h.in 2 additions, 2 deletions

src/config.h.in
src/console.c 3 additions, 3 deletions

src/console.c
src/d_clisrv.c 33 additions, 44 deletions

src/d_clisrv.c
src/d_clisrv.h 2 additions, 8 deletions

src/d_clisrv.h
src/d_main.c 42 additions, 18 deletions

src/d_main.c
src/d_net.c 64 additions, 61 deletions

src/d_net.c
src/d_netcmd.c 30 additions, 20 deletions

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

src/d_netcmd.h
src/d_netfil.c 2 additions, 4 deletions

src/d_netfil.c
src/d_player.h 6 additions, 0 deletions

src/d_player.h
src/dehacked.c 146 additions, 13 deletions

src/dehacked.c
src/doomdef.h 5 additions, 4 deletions

src/doomdef.h
src/doomstat.h 2 additions, 1 deletion

src/doomstat.h
src/f_finale.c 15 additions, 14 deletions

src/f_finale.c
src/f_finale.h 1 addition, 0 deletions

src/f_finale.h
src/g_game.c 70 additions, 63 deletions

src/g_game.c

with 796 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