Merge branch 'tutorial-time' into tutorial-time-firstprompt (5200f55e) · Commits · STJr / SRB2 · GitLab

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

5200f55e

Commit 5200f55e authored 6 years ago by Marco Z

Downloads
- Plain Diff

Merge branch 'tutorial-time' into tutorial-time-firstprompt

parents 3f1ade35 118da606

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 11 additions, 13 deletions

src/d_main.c
src/d_netcmd.c 7 additions, 1 deletion

src/d_netcmd.c
src/doomstat.h 5 additions, 0 deletions

src/doomstat.h
src/g_game.c 5 additions, 0 deletions

src/g_game.c
src/g_input.c 14 additions, 14 deletions

src/g_input.c
src/g_input.h 1 addition, 1 deletion

src/g_input.h
src/m_menu.c 46 additions, 13 deletions

src/m_menu.c
src/m_misc.c 16 additions, 2 deletions

src/m_misc.c
src/p_user.c 10 additions, 1 deletion

src/p_user.c

with 115 additions and 45 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