Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery (36228295) · 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

36228295

Commit 36228295 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

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

parents c61c1e25 02779cb6

No related branches found

No related tags found

No related merge requests found

Changes 28

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 15 additions, 5 deletions

src/d_main.c
src/dehacked.c 40 additions, 9 deletions

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

src/dehacked.h
src/doomdef.h 1 addition, 0 deletions

src/doomdef.h
src/doomstat.h 6 additions, 1 deletion

src/doomstat.h
src/f_finale.c 9 additions, 5 deletions

src/f_finale.c
src/f_finale.h 6 additions, 1 deletion

src/f_finale.h
src/f_wipe.c 190 additions, 44 deletions

src/f_wipe.c
src/g_game.c 2 additions, 3 deletions

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

src/hardware/hw_md2.c
src/i_system.h 0 additions, 4 deletions

src/i_system.h
src/lua_maplib.c 6 additions, 0 deletions

src/lua_maplib.c
src/m_anigif.c 61 additions, 7 deletions

src/m_anigif.c
src/m_menu.c 8 additions, 8 deletions

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

src/m_misc.c
src/p_mobj.c 1026 additions, 1017 deletions

src/p_mobj.c
src/p_setup.c 3 additions, 0 deletions

src/p_setup.c
src/r_data.c 0 additions, 2 deletions

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

src/r_data.h
src/r_plane.c 2 additions, 0 deletions

src/r_plane.c

with 1381 additions and 1114 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