Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups (5bbc31c1) · 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

5bbc31c1

Commit 5bbc31c1 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'acz-fixes' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into acz_touchups

# Conflicts:
#	src/p_enemy.c

parents cc87ba39 5460e0e1

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/info.c 1 addition, 1 deletion

src/info.c
src/p_enemy.c 30 additions, 5 deletions

src/p_enemy.c
src/p_inter.c 13 additions, 0 deletions

src/p_inter.c
src/p_map.c 29 additions, 33 deletions

src/p_map.c
src/p_mobj.c 1 addition, 0 deletions

src/p_mobj.c

with 74 additions and 39 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