Merge remote-tracking branch 'origin/master' into renderswitch (03a3b023) · 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

03a3b023

Commit 03a3b023 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 4e349cbd 75a5142a

No related branches found

No related tags found

2 merge requests!734Rebase Keycodes only branch.,!550Renderer switching

Changes 32

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 1 addition, 1 deletion

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

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

src/d_net.h
src/d_netcmd.c 4 additions, 0 deletions

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

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

src/dehacked.h
src/doomdef.h 5 additions, 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 150 additions, 72 deletions

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

src/g_game.h
src/hardware/hw_cache.c 36 additions, 32 deletions

src/hardware/hw_cache.c
src/hardware/hw_defs.h 1 addition, 1 deletion

src/hardware/hw_defs.h
src/hardware/hw_glob.h 0 additions, 1 deletion

src/hardware/hw_glob.h
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/i_tcp.c 23 additions, 12 deletions

src/i_tcp.c
src/m_anigif.c 61 additions, 7 deletions

src/m_anigif.c
src/m_menu.c 13 additions, 9 deletions

src/m_menu.c

with 542 additions and 205 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