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

f02fd19c

Commit f02fd19c authored 1 year ago by sphere

Downloads
- Plain Diff

Merge branch 'team-gametype-keep-player-color' into 'next'

Respect the player's skin and color selection

See merge request !2100

parents 6caff626 ebca345a

No related branches found

No related tags found

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

src/am_map.c 0 additions, 1 deletion

src/am_map.c
src/d_main.c 3 additions, 0 deletions

src/d_main.c
src/d_netcmd.c 77 additions, 162 deletions

src/d_netcmd.c
src/g_demo.c 6 additions, 3 deletions

src/g_demo.c
src/g_game.c 12 additions, 28 deletions

src/g_game.c
src/g_game.h 1 addition, 2 deletions

src/g_game.h
src/g_state.h 3 additions, 1 deletion

src/g_state.h
src/m_menu.c 2 additions, 10 deletions

src/m_menu.c
src/p_enemy.c 2 additions, 2 deletions

src/p_enemy.c
src/p_inter.c 3 additions, 3 deletions

src/p_inter.c
src/p_local.h 1 addition, 0 deletions

src/p_local.h
src/p_mobj.c 1 addition, 10 deletions

src/p_mobj.c
src/p_setup.c 14 additions, 28 deletions

src/p_setup.c
src/p_user.c 17 additions, 4 deletions

src/p_user.c
src/r_skins.c 15 additions, 4 deletions

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

src/r_skins.h
src/st_stuff.c 6 additions, 3 deletions

src/st_stuff.c

with 164 additions and 261 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