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

6c6d89ca

Commit 6c6d89ca authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'flickies_not_in_walls' into 'master'

Flickies not in walls

See merge request STJr/SRB2Internal!461

parents 031a352f a3de6d21

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 1 addition, 0 deletions

src/dehacked.c
src/info.c 2 additions, 1 deletion

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

src/info.h
src/p_enemy.c 23 additions, 9 deletions

src/p_enemy.c
src/p_local.h 1 addition, 1 deletion

src/p_local.h
src/p_mobj.c 5 additions, 6 deletions

src/p_mobj.c
src/p_user.c 1 addition, 1 deletion

src/p_user.c

with 34 additions and 18 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