Merge remote-tracking branch 'origin/master' into rotsprite_i (245881ec) · 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

245881ec

Commit 245881ec authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 91a01be8 c87297e3

No related branches found

No related tags found

No related merge requests found

Changes 67

Expand all Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 9 additions, 9 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 8 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 14 additions, 9 deletions

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

src/d_clisrv.c
src/d_main.c 64 additions, 63 deletions

src/d_main.c
src/d_main.h 3 additions, 0 deletions

src/d_main.h
src/d_netcmd.c 49 additions, 32 deletions

src/d_netcmd.c
src/d_netcmd.h 5 additions, 0 deletions

src/d_netcmd.h
src/dehacked.c 43 additions, 51 deletions

src/dehacked.c
src/doomtype.h 9 additions, 7 deletions

src/doomtype.h
src/f_finale.c 7 additions, 5 deletions

src/f_finale.c
src/g_game.c 509 additions, 151 deletions

src/g_game.c
src/g_game.h 2 additions, 1 deletion

src/g_game.h
src/hardware/hw_cache.c 47 additions, 127 deletions

src/hardware/hw_cache.c
src/hardware/hw_clip.c 4 additions, 4 deletions

src/hardware/hw_clip.c
src/hardware/hw_defs.h 20 additions, 6 deletions

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

src/hardware/hw_draw.c
src/hardware/hw_drv.h 5 additions, 9 deletions

src/hardware/hw_drv.h
src/hardware/hw_glob.h 3 additions, 4 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 146 additions, 162 deletions

src/hardware/hw_main.c

with 955 additions and 643 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