# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h

(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)

SteelT authored 5 years ago and James R. committed 4 years ago

Use '\0' instead, just in case

(cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)

Fix buffer overrun in I_ClipboardPaste (resolves #205)

Closes #205

See merge request !1105

Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request !982

Audio cleanup

See merge request !1101

Kill CD support

See merge request STJr/SRB2!1102

Word delete and backspace in console

See merge request !1092

Move the sky dome code out of r_opengl.c, fix issues with shaders

See merge request !1071

HTTP Based Master Server + Multithreading

See merge request !940

Make old analog functional again

See merge request !1098

Remove support for DOS

See merge request !1090

Make the player optional for COM_BufInsertText and COM_BufAddText.

See merge request !1093

Add capability to use model lighting with shaders enabled

See merge request !1073

Hide Metal Sonic's jet fume in first person

Closes #204

See merge request !1099

UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special…

See merge request !1096

Fix sector flat alignment issues in OpenGL

See merge request !1094

Big room fix for OpenGL

See merge request !1089

Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.

Include "is old" in the list of possible causes for a MD5 mismatch.

See merge request !1095

Merge udmf-next into next

See merge request !1075

Fix Credits sequence from Extras being unskippable

See merge request !1091

When no player is supplied, the command will run for all players.

Add missing GCC version flags to the Makefile

See merge request !1087

Stretch the fallback titlecard to the screen

See merge request !1019

Console variable to select music preference

See merge request !939

G_FindMap and G_FindMapByNameOrCode for Lua

See merge request !693

WIP because I don't know if this wording is right for the error.