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

3fc9c7d2

Commit 3fc9c7d2 authored 5 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER

parents 71319dce d0b9027d

No related branches found

No related tags found

2 merge requests!985Shaders next merge,!782Skin flag for disabling super colors in NiGHTS

Changes 32

Hide whitespace changes

Inline Side-by-side

Showing

src/config.h.in 4 additions, 4 deletions

src/config.h.in
src/console.c 10 additions, 1 deletion

src/console.c
src/d_clisrv.c 3 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 15 additions, 8 deletions

src/d_main.c
src/d_player.h 2 additions, 0 deletions

src/d_player.h
src/dehacked.c 1 addition, 4 deletions

src/dehacked.c
src/doomdef.h 1 addition, 0 deletions

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

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

src/g_game.c
src/hardware/hw_main.c 20 additions, 12 deletions

src/hardware/hw_main.c
src/hardware/r_opengl/r_opengl.c 2 additions, 0 deletions

src/hardware/r_opengl/r_opengl.c
src/lua_hudlib.c 50 additions, 10 deletions

src/lua_hudlib.c
src/lua_playerlib.c 4 additions, 0 deletions

src/lua_playerlib.c
src/lua_script.c 3 additions, 0 deletions

src/lua_script.c
src/m_menu.c 111 additions, 39 deletions

src/m_menu.c
src/p_mobj.c 56 additions, 14 deletions

src/p_mobj.c
src/p_polyobj.c 32 additions, 20 deletions

src/p_polyobj.c
src/p_saveg.c 14 additions, 5 deletions

src/p_saveg.c
src/p_spec.c 8 additions, 9 deletions

src/p_spec.c
src/p_user.c 5 additions, 1 deletion

src/p_user.c

with 350 additions and 136 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