Merge branch 'fancarry' into 'next' (70161ff5) · Commits · Leather Realms / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

70161ff5

Commit 70161ff5 authored 2 years ago by sphere

Downloads
- Plain Diff

Merge branch 'fancarry' into 'next'

Add carry type to fans (with fixed merge conflicts)

See merge request STJr/SRB2!1809

parents bc5c6530 2664fc70

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 2 additions, 1 deletion

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

src/deh_tables.c
src/p_map.c 4 additions, 3 deletions

src/p_map.c
src/p_spec.c 6 additions, 2 deletions

src/p_spec.c
src/p_user.c 27 additions, 4 deletions

src/p_user.c

with 40 additions and 10 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