Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit (d446f342) · 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

d446f342

Commit d446f342 authored 7 years ago by SteelT

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into dedicated-nosoundinit

parents 759ea8cb 7848e9f4

No related branches found

No related tags found

Loading

Changes 20

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 4 additions, 3 deletions

src/console.c
src/d_clisrv.c 21 additions, 5 deletions

src/d_clisrv.c
src/d_netcmd.c 0 additions, 3 deletions

src/d_netcmd.c
src/f_finale.c 19 additions, 11 deletions

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

src/hardware/hw_defs.h
src/hardware/hw_draw.c 249 additions, 43 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, 0 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 516 additions, 437 deletions

src/hardware/hw_main.c
src/hardware/r_opengl/r_opengl.c 188 additions, 68 deletions

src/hardware/r_opengl/r_opengl.c
src/lua_script.c 4 additions, 3 deletions

src/lua_script.c
src/m_misc.c 12 additions, 14 deletions

src/m_misc.c
src/sdl/hwsym_sdl.c 1 addition, 0 deletions

src/sdl/hwsym_sdl.c
src/sdl/i_system.c 17 additions, 11 deletions

src/sdl/i_system.c
src/sdl/i_video.c 1 addition, 0 deletions

src/sdl/i_video.c
src/sdl/ogl_sdl.c 5 additions, 2 deletions

src/sdl/ogl_sdl.c
src/sdl12/hwsym_sdl.c 1 addition, 0 deletions

src/sdl12/hwsym_sdl.c
src/sdl12/i_video.c 1 addition, 0 deletions

src/sdl12/i_video.c
src/v_video.c 0 additions, 8 deletions

src/v_video.c
src/win32/win_dll.c 2 additions, 0 deletions

src/win32/win_dll.c

with 1049 additions and 612 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