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

d62cd2ac

Commit d62cd2ac authored 5 years ago by ChaoLoveIceMDBoy

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook

parents dc51ba6b 0c40a466

2 merge requests!718Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil,!557PlayerThink Hook

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/command.c 33 additions, 15 deletions

src/command.c
src/d_main.c 14 additions, 20 deletions

src/d_main.c
src/d_netcmd.c 3 additions, 44 deletions

src/d_netcmd.c
src/g_game.c 55 additions, 0 deletions

src/g_game.c
src/g_game.h 3 additions, 0 deletions

src/g_game.h
src/m_menu.c 26 additions, 5 deletions

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

src/m_menu.h
src/screen.c 13 additions, 2 deletions

src/screen.c
src/screen.h 2 additions, 0 deletions

src/screen.h

with 152 additions and 88 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