Merge branch 'addplayer-2021-7-15' into 'addplayer' (1285ba9f) · 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

1285ba9f

Commit 1285ba9f authored 3 years ago by Claire Ellis

💬

Downloads
- Plain Diff

Merge branch 'addplayer-2021-7-15' into 'addplayer'

Addplayer 2021 7 15

See merge request STJr/SRB2!1585

parents 33ae95bf bac41161

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/g_game.c 21 additions, 1 deletion

src/g_game.c
src/lua_baselib.c 4 additions, 12 deletions

src/lua_baselib.c
src/p_inter.c 27 additions, 27 deletions

src/p_inter.c
src/p_saveg.c 2 additions, 0 deletions

src/p_saveg.c
src/p_user.c 3 additions, 1 deletion

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

src/r_skins.c

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