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

6a73e812

Commit 6a73e812 authored 4 years ago by lachwright

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into i-pity-you

parents 2bb5b429 d7b8d5d0

Branches

No related tags found

1 merge request!1146Allow JumpSpin abilities to be used with non-ability shields

Changes 77

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/android/i_cdmus.c 2 additions, 2 deletions

src/android/i_cdmus.c
src/android/i_video.c 1 addition, 1 deletion

src/android/i_video.c
src/blua/lvm.c 4 additions, 6 deletions

src/blua/lvm.c
src/command.c 33 additions, 18 deletions

src/command.c
src/command.h 6 additions, 0 deletions

src/command.h
src/config.h.in 3 additions, 2 deletions

src/config.h.in
src/console.c 61 additions, 28 deletions

src/console.c
src/d_clisrv.c 39 additions, 25 deletions

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

src/d_clisrv.h
src/d_main.c 47 additions, 19 deletions

src/d_main.c
src/d_net.h 3 additions, 1 deletion

src/d_net.h
src/d_netcmd.c 105 additions, 105 deletions

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

src/dehacked.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/dummy/i_cdmus.c 2 additions, 2 deletions

src/dummy/i_cdmus.c
src/dummy/i_video.c 1 addition, 1 deletion

src/dummy/i_video.c
src/f_finale.c 30 additions, 38 deletions

src/f_finale.c
src/filesrch.c 6 additions, 6 deletions

src/filesrch.c
src/g_demo.c 55 additions, 59 deletions

src/g_demo.c

with 409 additions and 315 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