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

cc541632

Commit cc541632 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents a0971d07 53c7df48

No related branches found

No related tags found

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

Changes 49

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 0 additions, 1 deletion

CMakeLists.txt
appveyor.yml 145 additions, 145 deletions

appveyor.yml
extras/conf/SRB2-22.cfg 3 additions, 3 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 1 addition, 5 deletions

src/CMakeLists.txt
src/d_clisrv.c 2 additions, 2 deletions

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

src/d_main.c
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/dehacked.c 4 additions, 2 deletions

src/dehacked.c
src/hardware/hw_cache.c 66 additions, 47 deletions

src/hardware/hw_cache.c
src/hardware/hw_data.h 1 addition, 0 deletions

src/hardware/hw_data.h
src/hardware/hw_defs.h 1 addition, 2 deletions

src/hardware/hw_defs.h
src/hardware/hw_drv.h 1 addition, 5 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 147 additions, 114 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 4 additions, 4 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 292 additions, 91 deletions

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

src/hardware/hw_md2.h
src/hardware/r_opengl/ogl_win.c 6 additions, 11 deletions

src/hardware/r_opengl/ogl_win.c
src/hardware/r_opengl/r_opengl.c 22 additions, 21 deletions

src/hardware/r_opengl/r_opengl.c
src/m_menu.c 18 additions, 52 deletions

src/m_menu.c

with 723 additions and 508 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