Merge remote-tracking branch 'origin/next' into fix-overtime (ae013108) · 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

ae013108

Commit ae013108 authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/next' into fix-overtime

parents 5dc0f064 7dac10f5

No related branches found

No related tags found

Loading

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/config.h.in 3 additions, 3 deletions

src/config.h.in
src/console.c 10 additions, 1 deletion

src/console.c
src/d_clisrv.c 3 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 9 additions, 8 deletions

src/d_main.c
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_game.c 3 additions, 0 deletions

src/g_game.c
src/lua_hudlib.c 7 additions, 3 deletions

src/lua_hudlib.c
src/m_menu.c 0 additions, 1 deletion

src/m_menu.c
src/p_mobj.c 56 additions, 14 deletions

src/p_mobj.c
src/p_polyobj.c 32 additions, 20 deletions

src/p_polyobj.c
src/p_saveg.c 7 additions, 0 deletions

src/p_saveg.c
src/p_user.c 3 additions, 1 deletion

src/p_user.c
src/r_things.c 1 addition, 0 deletions

src/r_things.c
src/w_wad.c 19 additions, 2 deletions

src/w_wad.c

with 154 additions and 57 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