# Conflicts:
#	src/r_things.h

Upstream merge of next

See merge request KartKrew/Kart-Public!139

Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486

# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c

Merge in next and don't billboard papersprites in GL

See merge request STJr/SRB2!488

# Conflicts:
#	src/p_user.c

New ping command

See merge request KartKrew/Kart-Public!123

Grab mouse focus whenever the window is focused

See merge request KartKrew/Kart-Public!120

Don't try operating on a closed socket

See merge request KartKrew/Kart-Public!133

Ban IP command

See merge request STJr/SRB2!460

Don't count down wait timer when executing a command line

See merge request STJr/SRB2!483

OpenGL Sprite Billboarding

See merge request STJr/SRB2!485

add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason

not making a merge request because this is so laughably stupidly simple

Don't enable UPnP support if NONET is defined.

See merge request STJr/SRB2!484

Because songs without this tag will skiplag when loading.

1. It's slow, 2. It's incorrect

Allow argument substitution in aliases

See merge request KartKrew/Kart-Public!124

Register showjoinaddress after the config loads and match some other cvars to its behavior

See merge request KartKrew/Kart-Public!135

Expose cv_numlaps.value as global variable

See merge request KartKrew/Kart-Public!134

New -port command line parameter

See merge request KartKrew/Kart-Public!137

When I say Encore you say how high

See merge request KartKrew/Kart-Public!136

Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.