Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3 (54da9552) · Commits · Hanicef / SRB2Classic · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2Classic
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Package Registry
- Terraform modules

Snippets Groups Projects

54da9552

Commit 54da9552 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3

parents 0d979035 92625483

No related branches found

No related tags found

No related merge requests found

Changes 111

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 6 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 3 additions, 0 deletions

src/Makefile
src/android/i_video.c 10 additions, 2 deletions

src/android/i_video.c
src/console.c 16 additions, 28 deletions

src/console.c
src/console.h 4 additions, 0 deletions

src/console.h
src/d_clisrv.c 182 additions, 795 deletions

src/d_clisrv.c
src/d_clisrv.h 5 additions, 178 deletions

src/d_clisrv.h
src/d_main.c 16 additions, 63 deletions

src/d_main.c
src/d_net.c 3 additions, 3 deletions

src/d_net.c
src/d_netcmd.c 3 additions, 4 deletions

src/d_netcmd.c
src/d_netcmd.h 2 additions, 3 deletions

src/d_netcmd.h
src/dehacked.c 45 additions, 8 deletions

src/dehacked.c
src/doomdata.h 2 additions, 2 deletions

src/doomdata.h
src/doomdef.h 0 additions, 3 deletions

src/doomdef.h
src/dummy/i_video.c 10 additions, 2 deletions

src/dummy/i_video.c
src/f_finale.c 139 additions, 154 deletions

src/f_finale.c
src/f_wipe.c 1 addition, 1 deletion

src/f_wipe.c
src/g_demo.c 10 additions, 13 deletions

src/g_demo.c
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hardware/hw_cache.c 169 additions, 159 deletions

src/hardware/hw_cache.c

with 627 additions and 1419 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