Merge remote-tracking branch 'origin/master' into fix_skipintro (6b151ef4) · 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

6b151ef4

Commit 6b151ef4 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into fix_skipintro

parents 41d5ffa1 602154fe

No related branches found

No related tags found

No related merge requests found

Changes 18

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 8 additions, 0 deletions

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

src/d_clisrv.h
src/d_netfil.c 6 additions, 1 deletion

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

src/d_player.h
src/dehacked.c 6 additions, 45 deletions

src/dehacked.c
src/g_game.c 6 additions, 2 deletions

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

src/g_game.h
src/info.c 67 additions, 110 deletions

src/info.c
src/info.h 2 additions, 45 deletions

src/info.h
src/lua_consolelib.c 9 additions, 0 deletions

src/lua_consolelib.c
src/lua_playerlib.c 12 additions, 0 deletions

src/lua_playerlib.c
src/p_enemy.c 31 additions, 9 deletions

src/p_enemy.c
src/p_inter.c 1 addition, 1 deletion

src/p_inter.c
src/p_map.c 3 additions, 0 deletions

src/p_map.c
src/p_mobj.c 27 additions, 18 deletions

src/p_mobj.c
src/p_saveg.c 8 additions, 0 deletions

src/p_saveg.c
src/p_user.c 71 additions, 25 deletions

src/p_user.c
src/st_stuff.c 15 additions, 12 deletions

src/st_stuff.c

with 280 additions and 268 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