Merge branch 'rollout-stuff' into 'next' (65350e59) · 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

65350e59

Commit 65350e59 authored 3 years ago by sphere

Downloads
- Plain Diff

Merge branch 'rollout-stuff' into 'next'

Rollout rock improvements

Closes #445, #221, and #532

See merge request STJr/SRB2!1401

parents 33d04380 d2db2040

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/info.c 1 addition, 1 deletion

src/info.c
src/p_enemy.c 10 additions, 4 deletions

src/p_enemy.c
src/p_map.c 7 additions, 0 deletions

src/p_map.c
src/p_user.c 10 additions, 4 deletions

src/p_user.c

with 28 additions and 9 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