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

0c1b5f07

Commit 0c1b5f07 authored 5 years ago by Marco Z

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into new-title

parents c7c72a48 96aa11c8

No related branches found

No related tags found

Loading

Changes 20

Expand all Hide whitespace changes

Inline Side-by-side

Showing

assets/CMakeLists.txt 3 additions, 4 deletions

assets/CMakeLists.txt
extras/conf/SRB2-22.cfg 1 addition, 1 deletion

extras/conf/SRB2-22.cfg
src/Makefile 1 addition, 4 deletions

src/Makefile
src/config.h.in 2 additions, 2 deletions

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

src/d_main.c
src/d_netfil.c 2 additions, 4 deletions

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

src/d_player.h
src/dehacked.c 6 additions, 0 deletions

src/dehacked.c
src/g_game.c 2 additions, 4 deletions

src/g_game.c
src/info.c 34 additions, 3 deletions

src/info.c
src/info.h 6 additions, 1 deletion

src/info.h
src/m_menu.c 3 additions, 2 deletions

src/m_menu.c
src/p_inter.c 19 additions, 2 deletions

src/p_inter.c
src/p_map.c 2 additions, 2 deletions

src/p_map.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_user.c 254 additions, 65 deletions

src/p_user.c
src/r_draw.c 37 additions, 1 deletion

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

src/r_draw.h
src/r_things.c 14 additions, 0 deletions

src/r_things.c
src/s_sound.c 3 additions, 3 deletions

src/s_sound.c

with 399 additions and 103 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