Merge branch 'flicky-things' into 'master' (ffde71c6) · 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

ffde71c6

Commit ffde71c6 authored 6 years ago by mazmazz

Downloads
- Plain Diff

Merge branch 'flicky-things' into 'master'

Flicky Thing Types

See merge request STJr/SRB2Internal!154

parents 2b0ce807 9e5b9ac5

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 54 additions, 0 deletions

src/dehacked.c
src/info.c 540 additions, 18 deletions

src/info.c
src/info.h 55 additions, 0 deletions

src/info.h
src/p_enemy.c 182 additions, 6 deletions

src/p_enemy.c
src/p_local.h 2 additions, 0 deletions

src/p_local.h
src/p_mobj.c 28 additions, 0 deletions

src/p_mobj.c

with 861 additions and 24 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