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

9010292b

Commit 9010292b authored 4 months ago by LJ Sonic

Downloads
- Plain Diff

Merge branch 'next' of git@git.do.srb2.org:STJr/SRB2.git into 2214-pre4

parents a7979ddd 3e6862b1

Branches

Tags

Loading

Checking pipeline status

Changes 40
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 5 additions, 0 deletions

src/CMakeLists.txt
src/Makefile.d/detect.mk 3 additions, 1 deletion

src/Makefile.d/detect.mk
src/Makefile.d/haiku.mk 71 additions, 0 deletions

src/Makefile.d/haiku.mk
src/Makefile.d/platform.mk 4 additions, 0 deletions

src/Makefile.d/platform.mk
src/Makefile.d/sdl.mk 7 additions, 5 deletions

src/Makefile.d/sdl.mk
src/d_think.h 2 additions, 0 deletions

src/d_think.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_demo.c 2 additions, 2 deletions

src/g_demo.c
src/g_game.c 3 additions, 3 deletions

src/g_game.c
src/lua_blockmaplib.c 4 additions, 5 deletions

src/lua_blockmaplib.c
src/lua_mobjlib.c 2 additions, 2 deletions

src/lua_mobjlib.c
src/lua_script.c 2 additions, 2 deletions

src/lua_script.c
src/m_cheat.c 2 additions, 2 deletions

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

src/m_menu.c
src/m_perfstats.c 7 additions, 7 deletions

src/m_perfstats.c
src/netcode/client_connection.c 1 addition, 4 deletions

src/netcode/client_connection.c
src/netcode/d_clisrv.c 1 addition, 1 deletion

src/netcode/d_clisrv.c
src/netcode/d_netcmd.c 1 addition, 1 deletion

src/netcode/d_netcmd.c
src/netcode/d_netfil.c 86 additions, 65 deletions

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

src/netcode/d_netfil.h

with 206 additions and 101 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