Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus (295b100d) · 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

295b100d

Commit 295b100d authored 7 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into more_about_menus

# Conflicts:
#	src/m_menu.c

parents 5bd71970 ca42659e

No related branches found

No related tags found

Loading

Changes 45

Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 6 additions, 0 deletions

src/b_bot.c
src/d_clisrv.c 20 additions, 7 deletions

src/d_clisrv.c
src/d_main.c 32 additions, 9 deletions

src/d_main.c
src/d_netcmd.c 21 additions, 3 deletions

src/d_netcmd.c
src/d_player.h 40 additions, 43 deletions

src/d_player.h
src/dehacked.c 153 additions, 25 deletions

src/dehacked.c
src/doomstat.h 8 additions, 0 deletions

src/doomstat.h
src/f_finale.c 133 additions, 13 deletions

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

src/f_finale.h
src/g_game.c 175 additions, 76 deletions

src/g_game.c
src/g_game.h 4 additions, 0 deletions

src/g_game.h
src/hardware/hw_main.c 2 additions, 4 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 1 addition, 11 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 138 additions, 17 deletions

src/hardware/hw_md2.c
src/hardware/hw_md2.h 3 additions, 1 deletion

src/hardware/hw_md2.h
src/hu_stuff.c 4 additions, 2 deletions

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

src/hu_stuff.h
src/info.c 85 additions, 1 deletion

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

src/info.h
src/lua_baselib.c 2 additions, 0 deletions

src/lua_baselib.c

with 843 additions and 215 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