Merge branch 'james-kart' into 'master' (2a8e5b7b) · Commits · Miguel Gustavo Rodrigues Teixeira / 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

2a8e5b7b

Commit 2a8e5b7b authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'james-kart' into 'master'

My changes to Kart

See merge request STJr/SRB2Internal!406

parents f1a7a3b4 9162ba87

No related branches found

No related tags found

Loading

Changes 19

Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 26 additions, 0 deletions

src/command.c
src/d_clisrv.c 3 additions, 35 deletions

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

src/d_clisrv.h
src/d_main.c 29 additions, 13 deletions

src/d_main.c
src/d_net.c 64 additions, 61 deletions

src/d_net.c
src/d_netcmd.c 2 additions, 4 deletions

src/d_netcmd.c
src/d_netcmd.h 0 additions, 2 deletions

src/d_netcmd.h
src/doomdef.h 5 additions, 4 deletions

src/doomdef.h
src/g_game.c 61 additions, 59 deletions

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

src/g_game.h
src/hardware/hw_bsp.c 1 addition, 1 deletion

src/hardware/hw_bsp.c
src/hardware/hw_dll.h 0 additions, 3 deletions

src/hardware/hw_dll.h
src/m_menu.c 5 additions, 2 deletions

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

src/m_menu.h
src/p_user.c 1 addition, 1 deletion

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

src/r_plane.c
src/s_sound.c 3 additions, 3 deletions

src/s_sound.c
src/screen.c 2 additions, 2 deletions

src/screen.c
src/sdl/i_video.c 18 additions, 6 deletions

src/sdl/i_video.c

with 224 additions and 205 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