Merge branch 'master' into leveltitle-tinkering (55fd60b2) · 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

55fd60b2

Commit 55fd60b2 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into leveltitle-tinkering

# Conflicts:
#	src/hu_stuff.h

parents fe6b47dc fa382c02

No related branches found

No related tags found

No related merge requests found

Changes 55

Expand all Hide whitespace changes

Inline Side-by-side

Showing

bin/Mingw/Release/.gitignore 1 addition, 0 deletions

bin/Mingw/Release/.gitignore
src/Makefile 3 additions, 1 deletion

src/Makefile
src/b_bot.c 1 addition, 2 deletions

src/b_bot.c
src/config.h.in 2 additions, 2 deletions

src/config.h.in
src/console.c 1 addition, 1 deletion

src/console.c
src/d_clisrv.c 14 additions, 13 deletions

src/d_clisrv.c
src/d_clisrv.h 2 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 3 additions, 12 deletions

src/d_main.c
src/d_netcmd.c 14 additions, 27 deletions

src/d_netcmd.c
src/d_player.h 4 additions, 2 deletions

src/d_player.h
src/dehacked.c 756 additions, 333 deletions

src/dehacked.c
src/doomdata.h 3 additions, 0 deletions

src/doomdata.h
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/doomstat.h 2 additions, 4 deletions

src/doomstat.h
src/f_finale.c 1 addition, 2 deletions

src/f_finale.c
src/g_game.c 19 additions, 24 deletions

src/g_game.c
src/hardware/hw_light.c 71 additions, 24 deletions

src/hardware/hw_light.c
src/hardware/hw_main.c 26 additions, 16 deletions

src/hardware/hw_main.c
src/hu_stuff.c 4 additions, 1 deletion

src/hu_stuff.c
src/hu_stuff.h 1 addition, 1 deletion

src/hu_stuff.h

with 929 additions and 467 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