Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang (d89050f0) · 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

d89050f0

Commit d89050f0 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang

# Conflicts:
#	src/r_defs.h

parents 0b110842 7deb18bd

Loading

Changes 44

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 12 additions, 8 deletions

src/b_bot.c
src/command.c 6 additions, 1 deletion

src/command.c
src/command.h 9 additions, 0 deletions

src/command.h
src/d_clisrv.c 2 additions, 2 deletions

src/d_clisrv.c
src/d_main.c 1 addition, 1 deletion

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

src/d_netcmd.c
src/dehacked.c 5 additions, 0 deletions

src/dehacked.c
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/f_finale.c 1 addition, 1 deletion

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

src/f_wipe.c
src/g_game.c 421 additions, 433 deletions

src/g_game.c
src/g_game.h 32 additions, 8 deletions

src/g_game.h
src/g_input.h 1 addition, 0 deletions

src/g_input.h
src/hardware/hw_cache.c 6 additions, 23 deletions

src/hardware/hw_cache.c
src/hardware/hw_glob.h 0 additions, 3 deletions

src/hardware/hw_glob.h
src/hardware/hw_md2.c 3 additions, 4 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 19 additions, 3 deletions

src/hardware/r_opengl/r_opengl.c
src/hu_stuff.c 6 additions, 2 deletions

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

src/info.c
src/lua_consolelib.c 14 additions, 6 deletions

src/lua_consolelib.c

with 573 additions and 512 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