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

cea890a6

Commit cea890a6 authored 1 year ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'custom-teams' into gametype-refactor-player-spawns

parents a5ac879c 592621fd

Branches

No related tags found

No related merge requests found

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
src/b_bot.c 3 additions, 2 deletions

src/b_bot.c
src/d_player.h 4 additions, 0 deletions

src/d_player.h
src/d_ticcmd.h 15 additions, 12 deletions

src/d_ticcmd.h
src/deh_lua.c 1 addition, 1 deletion

src/deh_lua.c
src/deh_tables.c 3 additions, 4 deletions

src/deh_tables.c
src/filesrch.c 10 additions, 0 deletions

src/filesrch.c
src/g_game.c 8 additions, 2 deletions

src/g_game.c
src/g_input.c 10 additions, 12 deletions

src/g_input.c
src/g_input.h 1 addition, 3 deletions

src/g_input.h
src/hardware/hw_main.c 81 additions, 17 deletions

src/hardware/hw_main.c
src/lua_baselib.c 2 additions, 1 deletion

src/lua_baselib.c
src/lua_hudlib.c 2 additions, 2 deletions

src/lua_hudlib.c
src/m_menu.c 29 additions, 28 deletions

src/m_menu.c
src/netcode/i_tcp.c 42 additions, 53 deletions

src/netcode/i_tcp.c
src/p_local.h 1 addition, 1 deletion

src/p_local.h
src/p_user.c 150 additions, 146 deletions

src/p_user.c
src/r_bbox.c 17 additions, 13 deletions

src/r_bbox.c
src/r_defs.h 1 addition, 1 deletion

src/r_defs.h
src/r_patch.h 1 addition, 1 deletion

src/r_patch.h

with 382 additions and 300 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