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

b3d678a2

Commit b3d678a2 authored 5 years ago by SteelT

Downloads
- Plain Diff

Merge branch 'master' into next

parents 14f4fa2e c1d54007

Branches

Tags

1 merge request!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 145 additions, 145 deletions

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

extras/conf/SRB2-22.cfg
src/d_clisrv.c 2 additions, 2 deletions

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

src/dehacked.c
src/hardware/hw_md2.c 35 additions, 0 deletions

src/hardware/hw_md2.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/w_wad.c 2 additions, 2 deletions

src/w_wad.c

with 192 additions and 155 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