Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

1bf584c0

Commit 1bf584c0 authored 6 years ago by Sryder

Downloads
- Plain Diff

Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout

parents e63b6aee 06b3e265

Loading

Changes 31

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/d_main.c 2 additions, 2 deletions

src/d_main.c
src/d_netcmd.c 19 additions, 15 deletions

src/d_netcmd.c
src/d_netfil.c 1 addition, 1 deletion

src/d_netfil.c
src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/dehacked.c 53 additions, 13 deletions

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

src/dehacked.h
src/doomstat.h 3 additions, 0 deletions

src/doomstat.h
src/filesrch.h 2 additions, 1 deletion

src/filesrch.h
src/g_game.c 60 additions, 29 deletions

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

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

src/info.c
src/k_kart.c 181 additions, 163 deletions

src/k_kart.c
src/lua_hudlib.c 20 additions, 1 deletion

src/lua_hudlib.c
src/lua_script.c 3 additions, 0 deletions

src/lua_script.c
src/m_cheat.c 6 additions, 6 deletions

src/m_cheat.c
src/m_cond.c 1 addition, 2 deletions

src/m_cond.c
src/m_menu.c 47 additions, 16 deletions

src/m_menu.c
src/p_enemy.c 2 additions, 2 deletions

src/p_enemy.c
src/p_map.c 3 additions, 240 deletions

src/p_map.c
src/p_mobj.c 6 additions, 6 deletions

src/p_mobj.c

with 416 additions and 501 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