Merge branch 'continue_startinglives' into 'master' (6d03c509) · 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

6d03c509

Commit 6d03c509 authored 7 years ago by toaster

Downloads
- Plain Diff

Merge branch 'continue_startinglives' into 'master'

Save cards and continue startinglives-balancing

See merge request !114

parents b8053802 d6701edc

Loading

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/doomstat.h 4 additions, 0 deletions

src/doomstat.h
src/f_finale.c 3 additions, 3 deletions

src/f_finale.c
src/g_game.c 100 additions, 73 deletions

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

src/g_game.h
src/hu_stuff.c 4 additions, 2 deletions

src/hu_stuff.c
src/hu_stuff.h 1 addition, 0 deletions

src/hu_stuff.h
src/m_cheat.c 1 addition, 1 deletion

src/m_cheat.c
src/m_menu.c 449 additions, 247 deletions

src/m_menu.c
src/m_menu.h 4 additions, 6 deletions

src/m_menu.h
src/p_inter.c 8 additions, 1 deletion

src/p_inter.c
src/p_saveg.c 15 additions, 32 deletions

src/p_saveg.c
src/p_saveg.h 1 addition, 2 deletions

src/p_saveg.h
src/p_setup.c 6 additions, 6 deletions

src/p_setup.c
src/p_user.c 9 additions, 3 deletions

src/p_user.c
src/st_stuff.c 34 additions, 51 deletions

src/st_stuff.c
src/v_video.c 70 additions, 39 deletions

src/v_video.c

with 711 additions and 466 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