Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup (a288b954) · 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

a288b954

Commit a288b954 authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup

parents 34e403af 423403ea

No related branches found

No related tags found

2 merge requests!488Merge in next and don't billboard papersprites in GL,!278Music Code Cleanup

Changes 39

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile 15 additions, 7 deletions

src/Makefile
src/android/i_sound.c 2 additions, 1 deletion

src/android/i_sound.c
src/d_clisrv.c 0 additions, 2 deletions

src/d_clisrv.c
src/d_main.c 0 additions, 1 deletion

src/d_main.c
src/d_main.h 1 addition, 4 deletions

src/d_main.h
src/d_net.c 2 additions, 0 deletions

src/d_net.c
src/d_netcmd.h 0 additions, 1 deletion

src/d_netcmd.h
src/djgppdos/i_sound.c 3 additions, 1 deletion

src/djgppdos/i_sound.c
src/doomstat.h 1 addition, 3 deletions

src/doomstat.h
src/dummy/i_sound.c 2 additions, 1 deletion

src/dummy/i_sound.c
src/f_finale.c 0 additions, 6 deletions

src/f_finale.c
src/g_game.c 0 additions, 1 deletion

src/g_game.c
src/hardware/hw_bsp.c 0 additions, 2 deletions

src/hardware/hw_bsp.c
src/hardware/hw_main.c 18 additions, 5 deletions

src/hardware/hw_main.c
src/hu_stuff.h 0 additions, 3 deletions

src/hu_stuff.h
src/i_sound.h 1 addition, 1 deletion

src/i_sound.h
src/lua_script.c 7 additions, 5 deletions

src/lua_script.c
src/m_anigif.c 3 additions, 1 deletion

src/m_anigif.c
src/nds/i_sound.c 2 additions, 1 deletion

src/nds/i_sound.c
src/p_local.h 0 additions, 1 deletion

src/p_local.h

with 57 additions and 47 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