Merge branch 'next' into 'better-download'
# Conflicts: # src/d_clisrv.c
Showing
- extras/conf/SRB2-22.cfg 19 additions, 0 deletionsextras/conf/SRB2-22.cfg
- src/d_clisrv.c 547 additions, 61 deletionssrc/d_clisrv.c
- src/d_clisrv.h 3 additions, 1 deletionsrc/d_clisrv.h
- src/d_main.c 3 additions, 0 deletionssrc/d_main.c
- src/d_player.h 3 additions, 0 deletionssrc/d_player.h
- src/dehacked.c 2 additions, 2 deletionssrc/dehacked.c
- src/g_demo.c 8 additions, 4 deletionssrc/g_demo.c
- src/g_game.c 45 additions, 13 deletionssrc/g_game.c
- src/g_game.h 1 addition, 0 deletionssrc/g_game.h
- src/lua_mathlib.c 2 additions, 1 deletionsrc/lua_mathlib.c
- src/lua_mobjlib.c 2 additions, 4 deletionssrc/lua_mobjlib.c
- src/m_cheat.c 8 additions, 3 deletionssrc/m_cheat.c
- src/m_fixed.h 0 additions, 12 deletionssrc/m_fixed.h
- src/p_inter.c 2 additions, 8 deletionssrc/p_inter.c
- src/p_local.h 4 additions, 0 deletionssrc/p_local.h
- src/p_map.c 3 additions, 18 deletionssrc/p_map.c
- src/p_mobj.c 12 additions, 8 deletionssrc/p_mobj.c
- src/p_polyobj.c 7 additions, 7 deletionssrc/p_polyobj.c
- src/p_polyobj.h 2 additions, 1 deletionsrc/p_polyobj.h
- src/p_saveg.c 6 additions, 5 deletionssrc/p_saveg.c
Loading
Please register or sign in to comment