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

2893803c

Commit 2893803c authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 720695a6 281d40d6

No related branches found

No related tags found

Loading

Changes 80

Expand all Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 11 additions, 6 deletions

appveyor.yml
src/am_map.c 98 additions, 24 deletions

src/am_map.c
src/am_map.h 3 additions, 0 deletions

src/am_map.h
src/command.c 12 additions, 4 deletions

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

src/config.h.in
src/console.c 11 additions, 2 deletions

src/console.c
src/d_clisrv.c 210 additions, 120 deletions

src/d_clisrv.c
src/d_clisrv.h 4 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 26 additions, 16 deletions

src/d_main.c
src/d_netcmd.c 42 additions, 23 deletions

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

src/d_netcmd.h
src/d_player.h 4 additions, 0 deletions

src/d_player.h
src/dehacked.c 109 additions, 89 deletions

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

src/doomdef.h
src/doomstat.h 18 additions, 13 deletions

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

src/f_finale.c
src/f_wipe.c 1 addition, 2 deletions

src/f_wipe.c
src/g_game.c 137 additions, 79 deletions

src/g_game.c
src/g_game.h 3 additions, 1 deletion

src/g_game.h

with 724 additions and 404 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