Merge branch 'addplayer' into 'next' (ccc71dda) · 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

ccc71dda

Commit ccc71dda authored 3 years ago by Claire Ellis

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'addplayer' into 'next'

Multiplayer Bot Features (aka AddPlayer)

See merge request STJr/SRB2!1383

parents 4309b592 1285ba9f

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/b_bot.c 132 additions, 106 deletions

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

src/b_bot.h
src/d_clisrv.c 1 addition, 1 deletion

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

src/d_clisrv.h
src/d_player.h 40 additions, 1 deletion

src/d_player.h
src/deh_tables.c 6 additions, 0 deletions

src/deh_tables.c
src/g_game.c 106 additions, 35 deletions

src/g_game.c
src/lua_baselib.c 109 additions, 0 deletions

src/lua_baselib.c
src/lua_playerlib.c 17 additions, 0 deletions

src/lua_playerlib.c
src/p_enemy.c 3 additions, 3 deletions

src/p_enemy.c
src/p_inter.c 31 additions, 31 deletions

src/p_inter.c
src/p_mobj.c 5 additions, 7 deletions

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

src/p_saveg.c
src/p_user.c 22 additions, 35 deletions

src/p_user.c
src/r_skins.c 5 additions, 0 deletions

src/r_skins.c

with 506 additions and 219 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