Merge remote-tracking branch 'origin/master' into next (93046c5e) · 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

93046c5e

Commit 93046c5e authored 5 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into next

parents 62d943b6 08627752

No related branches found

No related tags found

2 merge requests!848shaders master merge and mipmap fix,!809Fix buffer overrun with players that have no associated node

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/hardware/hw_data.h 0 additions, 1 deletion

src/hardware/hw_data.h
src/hardware/hw_md2.c 15 additions, 24 deletions

src/hardware/hw_md2.c
src/p_setup.c 5 additions, 0 deletions

src/p_setup.c
src/r_patch.c 3 additions, 1 deletion

src/r_patch.c
src/w_wad.c 1 addition, 1 deletion

src/w_wad.c
src/z_zone.c 2 additions, 0 deletions

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

src/z_zone.h

with 27 additions and 27 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