Skip to content
Snippets Groups Projects
Commit f7e9772e authored by James R.'s avatar James R.
Browse files

Merge branch 'i-pity-you' into 'next' 

Allow JumpSpin abilities to be used with non-ability shields

Closes #277

See merge request STJr/SRB2!1146
parents cb8f6097 6a73e812
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 102 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment