Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook

.travis.yml

appveyor.yml

assets/CMakeLists.txt

debian-template/control

deployer/travis/deployer_defaults.sh

src/d_clisrv.c

src/d_net.h

src/d_netcmd.c

src/g_game.c

src/g_game.h

src/i_tcp.c

src/m_menu.c

src/p_enemy.c

src/p_saveg.c

src/p_setup.c

src/p_spec.c

src/p_user.c

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj

src/w_wad.c

src/w_wad.h