Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color (69df136e) · Commits · STJr / SRB2 · GitLab

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

69df136e

Commit 69df136e authored 1 year ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color

parents 976b9b86 0f5e80a1

No related branches found

No related tags found

2 merge requests!2355fix newer versions of mixerx,!2100Respect the player's skin and color selection

Changes 63

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
appveyor.yml 1 addition, 1 deletion

appveyor.yml
extras/conf/SRB2-22.cfg 15 additions, 5 deletions

extras/conf/SRB2-22.cfg
extras/conf/udb/Includes/SRB222_things.cfg 16 additions, 5 deletions

extras/conf/udb/Includes/SRB222_things.cfg
src/Makefile 1 addition, 1 deletion

src/Makefile
src/Makefile.d/nix.mk 1 addition, 1 deletion

src/Makefile.d/nix.mk
src/config.h.in 3 additions, 1 deletion

src/config.h.in
src/d_main.c 7 additions, 6 deletions

src/d_main.c
src/d_netcmd.c 88 additions, 47 deletions

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

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

src/deh_lua.c
src/deh_tables.c 10 additions, 9 deletions

src/deh_tables.c
src/deh_tables.h 1 addition, 1 deletion

src/deh_tables.h
src/doomdata.h 4 additions, 0 deletions

src/doomdata.h
src/doomdef.h 7 additions, 7 deletions

src/doomdef.h
src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/doomtype.h 10 additions, 1 deletion

src/doomtype.h
src/f_finale.c 6 additions, 2 deletions

src/f_finale.c
src/g_game.c 31 additions, 15 deletions

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

src/g_game.h

with 208 additions and 104 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