Merge branch 'next' into jimita-flashpals-on-screenshots (dc273d3f) · Commits · Salt / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

dc273d3f

Commit dc273d3f authored 5 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'next' into jimita-flashpals-on-screenshots

parents 6e4b42fc 600a3737

No related branches found

No related tags found

No related merge requests found

Changes 29

Hide whitespace changes

Inline Side-by-side

Showing

.circleci/config.yml 8 additions, 5 deletions

.circleci/config.yml
.travis.yml 14 additions, 5 deletions

.travis.yml
CMakeLists.txt 9 additions, 3 deletions

CMakeLists.txt
src/command.c 19 additions, 14 deletions

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

src/command.h
src/console.c 34 additions, 27 deletions

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

src/d_clisrv.c
src/d_main.c 6 additions, 40 deletions

src/d_main.c
src/d_netcmd.c 32 additions, 47 deletions

src/d_netcmd.c
src/doomstat.h 4 additions, 1 deletion

src/doomstat.h
src/f_finale.c 21 additions, 10 deletions

src/f_finale.c
src/g_game.c 32 additions, 0 deletions

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

src/g_game.h
src/hardware/hw_main.c 121 additions, 27 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 1 addition, 0 deletions

src/hardware/hw_main.h
src/hu_stuff.c 13 additions, 23 deletions

src/hu_stuff.c
src/i_tcp.c 7 additions, 3 deletions

src/i_tcp.c
src/m_menu.c 5 additions, 22 deletions

src/m_menu.c
src/p_inter.c 1 addition, 1 deletion

src/p_inter.c
src/p_saveg.c 0 additions, 2 deletions

src/p_saveg.c

with 375 additions and 240 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