Merge branch 'ending' into 'master' (8a0f1e7e) · Commits · AJ Martinez / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

8a0f1e7e

Commit 8a0f1e7e authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'ending' into 'master'

ENDINGS

See merge request STJr/SRB2Internal!264

parents 9f34a7aa f141220e

Loading

Changes 33

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 1 addition, 1 deletion

src/console.c
src/d_main.c 6 additions, 0 deletions

src/d_main.c
src/dehacked.c 4 additions, 0 deletions

src/dehacked.c
src/doomstat.h 1 addition, 1 deletion

src/doomstat.h
src/f_finale.c 742 additions, 64 deletions

src/f_finale.c
src/f_finale.h 8 additions, 2 deletions

src/f_finale.h
src/f_wipe.c 2 additions, 0 deletions

src/f_wipe.c
src/g_game.c 21 additions, 6 deletions

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

src/g_game.h
src/g_state.h 3 additions, 1 deletion

src/g_state.h
src/hardware/hw_draw.c 273 additions, 32 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.h 1 addition, 0 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 10 additions, 1 deletion

src/hardware/hw_md2.c
src/hu_stuff.c 1 addition, 1 deletion

src/hu_stuff.c
src/info.c 7 additions, 5 deletions

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

src/info.h
src/lua_baselib.c 2 additions, 2 deletions

src/lua_baselib.c
src/lua_infolib.c 20 additions, 5 deletions

src/lua_infolib.c
src/lua_skinlib.c 0 additions, 25 deletions

src/lua_skinlib.c
src/m_cond.c 1 addition, 1 deletion

src/m_cond.c

with 1106 additions and 147 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