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

1155a7c3

Commit 1155a7c3 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_mobj.c

parents bc794a22 ff8c4366

No related branches found

No related tags found

No related merge requests found

Changes 90

Hide whitespace changes

Inline Side-by-side

Showing

.gitattributes 9 additions, 0 deletions

.gitattributes
libs/libpng-src/pngconf.h 0 additions, 1 deletion

libs/libpng-src/pngconf.h
libs/libpng-src/projects/libpng32.a 0 additions, 0 deletions

libs/libpng-src/projects/libpng32.a
libs/libpng-src/projects/libpng64.a 0 additions, 0 deletions

libs/libpng-src/projects/libpng64.a
srb2.png 0 additions, 0 deletions

srb2.png
src/Makefile.cfg 1 addition, 2 deletions

src/Makefile.cfg
src/am_map.c 36 additions, 25 deletions

src/am_map.c
src/am_map.h 0 additions, 5 deletions

src/am_map.h
src/d_clisrv.c 37 additions, 15 deletions

src/d_clisrv.c
src/d_clisrv.h 5 additions, 0 deletions

src/d_clisrv.h
src/d_main.c 7 additions, 2 deletions

src/d_main.c
src/d_netcmd.c 23 additions, 17 deletions

src/d_netcmd.c
src/d_netfil.c 6 additions, 1 deletion

src/d_netfil.c
src/d_player.h 5 additions, 0 deletions

src/d_player.h
src/dehacked.c 160 additions, 65 deletions

src/dehacked.c
src/doomdef.h 7 additions, 0 deletions

src/doomdef.h
src/doomstat.h 6 additions, 0 deletions

src/doomstat.h
src/f_finale.c 230 additions, 36 deletions

src/f_finale.c
src/filesrch.c 1 addition, 1 deletion

src/filesrch.c
src/g_game.c 101 additions, 44 deletions

src/g_game.c

with 634 additions and 214 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