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

4f3c9b5f

Commit 4f3c9b5f authored 7 years ago by toaster

Downloads
- Plain Diff

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

# Conflicts:
#	src/hardware/hw_draw.c

parents 3f427d01 a3b86a73

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/f_finale.c 13 additions, 5 deletions

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

src/hardware/hw_defs.h
src/hardware/hw_draw.c 351 additions, 81 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/r_opengl/r_opengl.c 152 additions, 60 deletions

src/hardware/r_opengl/r_opengl.c
src/sdl/hwsym_sdl.c 1 addition, 0 deletions

src/sdl/hwsym_sdl.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/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 1080 additions and 613 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