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

0accadf0

Commit 0accadf0 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into gametype-clownery

parents fb6f2fc9 4029167a

Branches

Tags

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!566Custom gametypes

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/dehacked.c 72 additions, 0 deletions

src/dehacked.c
src/lua_baselib.c 8 additions, 14 deletions

src/lua_baselib.c
src/lua_hud.h 1 addition, 0 deletions

src/lua_hud.h
src/lua_hudlib.c 1 addition, 0 deletions

src/lua_hudlib.c
src/lua_maplib.c 2 additions, 2 deletions

src/lua_maplib.c
src/m_cheat.c 3 additions, 4 deletions

src/m_cheat.c
src/p_enemy.c 23 additions, 8 deletions

src/p_enemy.c
src/p_mobj.c 96 additions, 125 deletions

src/p_mobj.c
src/p_setup.c 69 additions, 79 deletions

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

src/p_user.c
src/st_stuff.c 35 additions, 4 deletions

src/st_stuff.c

with 312 additions and 238 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