Merge remote-tracking branch 'origin/master' into flats-in-walls (141d0376) · 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

141d0376

Commit 141d0376 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into flats-in-walls

parents e01eb190 53c7df48

No related branches found

No related tags found

Loading

Changes 45

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 0 additions, 1 deletion

CMakeLists.txt
src/CMakeLists.txt 1 addition, 5 deletions

src/CMakeLists.txt
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 62 additions, 40 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, 0 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 126 additions, 104 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 3 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
src/p_setup.c 10 additions, 16 deletions

src/p_setup.c
src/r_bsp.c 8 additions, 0 deletions

src/r_bsp.c
src/r_data.c 9 additions, 0 deletions

src/r_data.c

with 574 additions and 356 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