Merge remote-tracking branch 'upstream/master' into viewroll (c4b390bc) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

c4b390bc

Commit c4b390bc authored 5 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into viewroll

parents bea7ad21 7dac10f5

Loading

Changes 45

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

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/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 10 additions, 3 deletions

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

src/d_main.c
src/d_netcmd.c 13 additions, 2 deletions

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

src/d_netcmd.h
src/dehacked.c 43 additions, 40 deletions

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

src/doomdef.h
src/f_finale.c 17 additions, 15 deletions

src/f_finale.c
src/g_game.c 9 additions, 2 deletions

src/g_game.c
src/hardware/hw_main.c 6 additions, 38 deletions

src/hardware/hw_main.c
src/hu_stuff.c 12 additions, 3 deletions

src/hu_stuff.c
src/info.c 11 additions, 10 deletions

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

src/info.h
src/lua_hudlib.c 12 additions, 8 deletions

src/lua_hudlib.c
src/m_anigif.c 5 additions, 13 deletions

src/m_anigif.c

with 271 additions and 178 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