Merge remote-tracking branch 'origin/master' into next (02779cb6) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

02779cb6

Commit 02779cb6 authored 5 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 0780e48f 75a5142a

No related branches found

No related tags found

Loading

Changes 23

Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 15 additions, 5 deletions

src/d_main.c
src/dehacked.c 22 additions, 8 deletions

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

src/dehacked.h
src/doomdef.h 1 addition, 0 deletions

src/doomdef.h
src/f_finale.c 9 additions, 5 deletions

src/f_finale.c
src/f_finale.h 6 additions, 1 deletion

src/f_finale.h
src/f_wipe.c 190 additions, 44 deletions

src/f_wipe.c
src/g_game.c 2 additions, 3 deletions

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

src/hardware/hw_md2.c
src/i_system.h 0 additions, 4 deletions

src/i_system.h
src/m_anigif.c 61 additions, 7 deletions

src/m_anigif.c
src/m_menu.c 8 additions, 8 deletions

src/m_menu.c
src/m_misc.c 2 additions, 6 deletions

src/m_misc.c
src/r_data.c 0 additions, 2 deletions

src/r_data.c
src/r_data.h 2 additions, 0 deletions

src/r_data.h
src/r_plane.c 2 additions, 0 deletions

src/r_plane.c
src/sdl/i_main.c 8 additions, 5 deletions

src/sdl/i_main.c
src/sdl/i_system.c 123 additions, 12 deletions

src/sdl/i_system.c
src/sdl/i_video.c 2 additions, 3 deletions

src/sdl/i_video.c
src/sdl/mixer_sound.c 20 additions, 18 deletions

src/sdl/mixer_sound.c

with 475 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