Merge branch 'stopclock' into 'master' (14477748) · Commits · SteelT / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

14477748

Commit 14477748 authored 5 years ago by MascaraSnake

Downloads
- Plain Diff

Merge branch 'stopclock' into 'master'

Stop the clock!

See merge request STJr/SRB2Internal!450

parents 7cfc7b38 a82902a3

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

extras/conf/SRB2-22.cfg 6 additions, 0 deletions

extras/conf/SRB2-22.cfg
src/m_menu.c 4 additions, 0 deletions

src/m_menu.c
src/p_enemy.c 10 additions, 0 deletions

src/p_enemy.c
src/p_mobj.h 1 addition, 0 deletions

src/p_mobj.h
src/p_saveg.c 25 additions, 11 deletions

src/p_saveg.c
src/p_setup.c 1 addition, 0 deletions

src/p_setup.c
src/p_spec.c 23 additions, 0 deletions

src/p_spec.c
src/p_tick.c 1 addition, 1 deletion

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

src/p_user.c
src/st_stuff.c 5 additions, 3 deletions

src/st_stuff.c

with 78 additions and 17 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