Merge branch 'addons-backport' into '2122-version' (8d56c2f4) · 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

8d56c2f4

Commit 8d56c2f4 authored 6 years ago by mazmazz

Downloads
- Plain Diff

Merge branch 'addons-backport' into '2122-version'

Addons Menu backport to vanilla

See merge request !384

parents fa36b8f5 ec530323

No related branches found

No related tags found

Loading

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 4 additions, 0 deletions

src/console.c
src/d_clisrv.h 2 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 35 additions, 17 deletions

src/d_main.c
src/d_netcmd.c 21 additions, 25 deletions

src/d_netcmd.c
src/d_netfil.c 22 additions, 59 deletions

src/d_netfil.c
src/d_netfil.h 0 additions, 1 deletion

src/d_netfil.h
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/filesrch.c 469 additions, 8 deletions

src/filesrch.c
src/filesrch.h 70 additions, 0 deletions

src/filesrch.h
src/m_menu.c 612 additions, 6 deletions

src/m_menu.c
src/m_menu.h 5 additions, 0 deletions

src/m_menu.h
src/p_setup.c 3 additions, 0 deletions

src/p_setup.c
src/v_video.h 2 additions, 0 deletions

src/v_video.h
src/w_wad.c 30 additions, 16 deletions

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

src/w_wad.h

with 1279 additions and 133 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