Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks (a3f758f3) · Commits · Fancy2209 / 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

a3f758f3

Commit a3f758f3 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks

# Conflicts:
#	src/p_mobj.c

parents f9f92abc 726b0f6c

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/g_game.c 2 additions, 1 deletion

src/g_game.c
src/p_enemy.c 14 additions, 1 deletion

src/p_enemy.c
src/p_mobj.c 2 additions, 2 deletions

src/p_mobj.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_user.c 39 additions, 10 deletions

src/p_user.c
src/r_data.c 51 additions, 18 deletions

src/r_data.c
src/w_wad.c 25 additions, 3 deletions

src/w_wad.c
src/w_wad.h 1 addition, 0 deletions

src/w_wad.h

with 136 additions and 36 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