Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle (dd9efeba) · Commits · twi / 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

dd9efeba

Commit dd9efeba authored 5 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle

parents 0c96c540 8a0f1e7e

No related branches found

No related tags found

No related merge requests found

Changes 81

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 1 addition, 1 deletion

src/console.c
src/d_clisrv.c 2 additions, 7 deletions

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

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

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

src/d_player.h
src/dehacked.c 74 additions, 34 deletions

src/dehacked.c
src/doomdata.h 3 additions, 5 deletions

src/doomdata.h
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/f_finale.c 745 additions, 66 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 36 additions, 16 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_light.c 67 additions, 35 deletions

src/hardware/hw_light.c
src/hardware/hw_main.c 7 additions, 5 deletions

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

src/hardware/hw_main.h
src/hardware/hw_md2.c 141 additions, 34 deletions

src/hardware/hw_md2.c

with 1380 additions and 244 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