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

0377d9e8

Commit 0377d9e8 authored 1 year ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'stjr/next' into sector-portals

parents d6e13fe2 858f102c

Branches

Tags

2 merge requests!2355fix newer versions of mixerx,!2139Sector portals

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/config.h.in 1 addition, 1 deletion

src/config.h.in
src/d_netcmd.c 2 additions, 0 deletions

src/d_netcmd.c
src/deh_tables.c 7 additions, 7 deletions

src/deh_tables.c
src/doomdef.h 7 additions, 7 deletions

src/doomdef.h
src/f_finale.c 5 additions, 1 deletion

src/f_finale.c
src/g_game.c 5 additions, 3 deletions

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

src/g_game.h
src/hu_stuff.c 1 addition, 1 deletion

src/hu_stuff.c
src/info.c 15 additions, 15 deletions

src/info.c
src/lua_consolelib.c 1 addition, 1 deletion

src/lua_consolelib.c
src/lua_hudlib.c 1 addition, 2 deletions

src/lua_hudlib.c
src/lua_maplib.c 8 additions, 4 deletions

src/lua_maplib.c
src/m_menu.c 4 additions, 4 deletions

src/m_menu.c
src/p_map.c 3 additions, 4 deletions

src/p_map.c
src/p_mobj.c 2 additions, 3 deletions

src/p_mobj.c
src/p_user.c 5 additions, 2 deletions

src/p_user.c
src/r_bbox.c 1 addition, 1 deletion

src/r_bbox.c
src/r_skins.c 13 additions, 13 deletions

src/r_skins.c

with 85 additions and 70 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