Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx (b99f06c0) · 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

b99f06c0

Commit b99f06c0 authored 5 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx

parents 2075b525 8a0f1e7e

Loading

Changes 57

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 1 addition, 1 deletion

src/console.c
src/d_main.c 6 additions, 0 deletions

src/d_main.c
src/dehacked.c 16 additions, 6 deletions

src/dehacked.c
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/f_finale.c 742 additions, 64 deletions

src/f_finale.c
src/f_finale.h 8 additions, 3 deletions

src/f_finale.h
src/f_wipe.c 2 additions, 0 deletions

src/f_wipe.c
src/g_game.c 28 additions, 7 deletions

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

src/g_game.h
src/g_state.h 4 additions, 1 deletion

src/g_state.h
src/hardware/hw_draw.c 273 additions, 32 deletions

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

src/hardware/hw_main.h
src/hardware/hw_md2.c 10 additions, 1 deletion

src/hardware/hw_md2.c
src/hu_stuff.c 1 addition, 1 deletion

src/hu_stuff.c
src/info.c 135 additions, 19 deletions

src/info.c
src/info.h 13 additions, 6 deletions

src/info.h
src/lua_baselib.c 16 additions, 8 deletions

src/lua_baselib.c
src/lua_consolelib.c 0 additions, 3 deletions

src/lua_consolelib.c
src/lua_infolib.c 20 additions, 5 deletions

src/lua_infolib.c
src/lua_maplib.c 16 additions, 32 deletions

src/lua_maplib.c

with 1298 additions and 191 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