Merge remote-tracking branch 'origin/next' into server-bots (8ed18a12) · 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

8ed18a12

Commit 8ed18a12 authored 3 years ago by Lach

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into server-bots

parents 2975b22a e8c83f48

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 7 additions, 2 deletions

src/b_bot.c
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/deh_tables.c 1 addition, 0 deletions

src/deh_tables.c
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hu_stuff.c 9 additions, 9 deletions

src/hu_stuff.c
src/m_menu.c 1 addition, 3 deletions

src/m_menu.c
src/p_local.h 1 addition, 0 deletions

src/p_local.h
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_setup.c 42 additions, 35 deletions

src/p_setup.c
src/p_user.c 4 additions, 4 deletions

src/p_user.c
src/st_stuff.c 1 addition, 1 deletion

src/st_stuff.c
src/y_inter.c 2 additions, 2 deletions

src/y_inter.c

with 71 additions and 59 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