Merge branch 'next' into public_next (4f588428) · Commits · JugadorXEI / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

4f588428

Commit 4f588428 authored 2 years ago by toaster

Downloads
- Plain Diff

Merge branch 'next' into public_next

# Conflicts:
#	src/i_tcp.c

parents 8fa22d56 64474c35

No related branches found

No related tags found

No related merge requests found

Changes 87

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 6 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 2 additions, 0 deletions

src/Makefile
src/android/i_system.c 8 additions, 4 deletions

src/android/i_system.c
src/b_bot.c 2 additions, 2 deletions

src/b_bot.c
src/blua/Makefile.cfg 2 additions, 1 deletion

src/blua/Makefile.cfg
src/byteptr.h 75 additions, 23 deletions

src/byteptr.h
src/command.c 28 additions, 12 deletions

src/command.c
src/d_clisrv.c 420 additions, 160 deletions

src/d_clisrv.c
src/d_clisrv.h 3 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 126 additions, 30 deletions

src/d_main.c
src/d_net.c 12 additions, 2 deletions

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

src/d_net.h
src/d_netcmd.c 62 additions, 25 deletions

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

src/d_netcmd.h
src/d_netfil.c 1 addition, 0 deletions

src/d_netfil.c
src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/discord.c 3 additions, 0 deletions

src/discord.c
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/doomtype.h 2 additions, 0 deletions

src/doomtype.h
src/dummy/i_system.c 6 additions, 3 deletions

src/dummy/i_system.c

with 762 additions and 264 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