Merge remote-tracking branch 'origin/next' into gametype-clownery (7e5ec552) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

7e5ec552

Commit 7e5ec552 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents 36228295 f11caefe

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/m_cheat.c 11 additions, 21 deletions

src/m_cheat.c
src/p_mobj.c 232 additions, 341 deletions

src/p_mobj.c
src/p_mobj.h 4 additions, 2 deletions

src/p_mobj.h
src/p_saveg.c 1 addition, 1 deletion

src/p_saveg.c
src/p_setup.c 17 additions, 26 deletions

src/p_setup.c

with 266 additions and 392 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