Merge branch 'shieldless' into 'next' (84e9020e) · 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

84e9020e

Commit 84e9020e authored 4 years ago by James R.

Downloads
- Plain Diff

Merge branch 'shieldless' into 'next'

Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331

parents a36908a5 d999e436

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 2 additions, 0 deletions

src/d_player.h
src/deh_tables.c 1 addition, 0 deletions

src/deh_tables.c
src/p_user.c 3 additions, 3 deletions

src/p_user.c
src/r_skins.c 1 addition, 0 deletions

src/r_skins.c

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