Merge branch 'shaders-222' into 'sal-oglshaderport' (9f7a0a11) · 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

9f7a0a11

Commit 9f7a0a11 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'shaders-222' into 'sal-oglshaderport'

shaders master merge and mipmap fix

See merge request !848

parents 952bce36 e3b17cd8

No related branches found

No related tags found

Loading

Changes 198

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
assets/CMakeLists.txt 2 additions, 1 deletion

assets/CMakeLists.txt
src/Makefile 1 addition, 1 deletion

src/Makefile
src/am_map.c 1 addition, 1 deletion

src/am_map.c
src/am_map.h 1 addition, 1 deletion

src/am_map.h
src/apng.c 1 addition, 1 deletion

src/apng.c
src/apng.h 1 addition, 1 deletion

src/apng.h
src/asm_defs.inc 1 addition, 1 deletion

src/asm_defs.inc
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/b_bot.h 1 addition, 1 deletion

src/b_bot.h
src/byteptr.h 1 addition, 1 deletion

src/byteptr.h
src/command.c 1 addition, 1 deletion

src/command.c
src/command.h 1 addition, 1 deletion

src/command.h
src/config.h.in 2 additions, 2 deletions

src/config.h.in
src/console.c 2 additions, 11 deletions

src/console.c
src/console.h 1 addition, 1 deletion

src/console.h
src/d_clisrv.c 4 additions, 2 deletions

src/d_clisrv.c
src/d_clisrv.h 1 addition, 1 deletion

src/d_clisrv.h
src/d_event.h 1 addition, 1 deletion

src/d_event.h

with 26 additions and 32 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