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

00bdb416

Commit 00bdb416 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into sal-oglshaderport

parents 81a2a9e9 9bd9e667

No related branches found

No related tags found

1 merge request!724OpenGL shaders

Changes 45

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/am_map.c 98 additions, 24 deletions

src/am_map.c
src/am_map.h 3 additions, 0 deletions

src/am_map.h
src/command.c 11 additions, 3 deletions

src/command.c
src/config.h.in 4 additions, 4 deletions

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

src/console.c
src/d_clisrv.c 9 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 9 additions, 8 deletions

src/d_main.c
src/d_netcmd.c 14 additions, 2 deletions

src/d_netcmd.c
src/d_netcmd.h 1 addition, 0 deletions

src/d_netcmd.h
src/dehacked.c 74 additions, 86 deletions

src/dehacked.c
src/doomdef.h 4 additions, 4 deletions

src/doomdef.h
src/doomstat.h 5 additions, 4 deletions

src/doomstat.h
src/f_finale.c 5 additions, 2 deletions

src/f_finale.c
src/g_game.c 41 additions, 8 deletions

src/g_game.c
src/hardware/hw_md2.c 63 additions, 24 deletions

src/hardware/hw_md2.c
src/hardware/hw_md2.h 2 additions, 0 deletions

src/hardware/hw_md2.h
src/info.c 9 additions, 8 deletions

src/info.c
src/info.h 1 addition, 0 deletions

src/info.h

with 366 additions and 184 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