Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode (15604537) · 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

15604537

Commit 15604537 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode

# Conflicts:
#	src/p_map.c

parents d553b6a0 354429ca

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 11 additions, 3 deletions

src/b_bot.c
src/dehacked.c 2 additions, 2 deletions

src/dehacked.c
src/f_finale.c 1 addition, 0 deletions

src/f_finale.c
src/info.c 8 additions, 9 deletions

src/info.c
src/info.h 2 additions, 3 deletions

src/info.h
src/p_enemy.c 45 additions, 41 deletions

src/p_enemy.c
src/p_inter.c 3 additions, 3 deletions

src/p_inter.c
src/p_map.c 39 additions, 38 deletions

src/p_map.c
src/p_mobj.c 5 additions, 4 deletions

src/p_mobj.c
src/p_spec.c 42 additions, 138 deletions

src/p_spec.c
src/p_tick.c 1 addition, 1 deletion

src/p_tick.c
src/p_user.c 2 additions, 2 deletions

src/p_user.c
src/r_defs.h 9 additions, 4 deletions

src/r_defs.h
src/st_stuff.c 2 additions, 1 deletion

src/st_stuff.c

with 172 additions and 249 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