Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git... (976331fb) · 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

976331fb

Commit 976331fb authored 7 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git...

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again

parents 740e0cf8 375c3c58

Loading

Changes 47

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 46 additions, 40 deletions

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

src/console.h
src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_netcmd.c 5 additions, 1 deletion

src/d_netcmd.c
src/dehacked.c 54 additions, 18 deletions

src/dehacked.c
src/doomdef.h 0 additions, 3 deletions

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

src/doomstat.h
src/f_finale.c 30 additions, 22 deletions

src/f_finale.c
src/g_game.c 5 additions, 3 deletions

src/g_game.c
src/hardware/hw_cache.c 14 additions, 2 deletions

src/hardware/hw_cache.c
src/hardware/hw_defs.h 5 additions, 4 deletions

src/hardware/hw_defs.h
src/hardware/hw_draw.c 422 additions, 62 deletions

src/hardware/hw_draw.c
src/hardware/hw_drv.h 2 additions, 0 deletions

src/hardware/hw_drv.h
src/hardware/hw_glob.h 1 addition, 1 deletion

src/hardware/hw_glob.h
src/hardware/hw_main.c 547 additions, 452 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 1 addition, 1 deletion

src/hardware/hw_main.h
src/hardware/r_opengl/r_opengl.c 152 additions, 60 deletions

src/hardware/r_opengl/r_opengl.c
src/hu_stuff.c 49 additions, 67 deletions

src/hu_stuff.c
src/hu_stuff.h 1 addition, 2 deletions

src/hu_stuff.h
src/info.c 156 additions, 121 deletions

src/info.c

with 1493 additions and 861 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