Lactozilla authored 4 years ago and LJ Sonic committed 4 years ago

This reverts commit 6f9c48a3.

# Conflicts:
#	src/p_mobj.c

Add Logan to the credits

See merge request !1379

Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403)

Closes #403

See merge request !1346

Pressing Ctrl+Backspace In An Empty Console Crashes SRB2

See merge request !1370

Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request !1337

Revert plane sorting changes

See merge request !1353

Let Lua toggle the crosshair

See merge request !1360

get stryder7x in on this

This reverts merge request !1235

Return nil on skincolor invalid field access

See merge request STJr/SRB2!1351

Fix the "missing initializer" warning/error in the CVAR_INIT macro

See merge request STJr/SRB2!1350

So we don't get Luas with access to LUA_GetErrorMessage.

Lua multitagging

See merge request !1292

# Conflicts:
#	src/doomtype.h

Fix vibing slope planes

See merge request !1335

Restore the viewpoint's angle in R_DrawPlanes instead (related to #404)

See merge request !1326

Replace the first entry in slope vertex thing taglists, instead of adding into them (related to #404)

See merge request !1333

Fix archived mobjs having no default blend mode and sprite scales

See merge request !1300

Improved text colormaps (Closes #222 and #359)

Closes #222 and #359

See merge request STJr/SRB2!1202

I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.

Add new skin flag SF_NOSHIELDABILITY

See merge request STJr/SRB2!1331

fix amy meeting herself in mario mode

See merge request !1330

Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats

See merge request !1324

Make fiery spindust fullbright

See merge request STJr/SRB2!1317

Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request !1315

Fix animated skincolors in OpenGL (resolves #187, #247, #301, #370)

Closes #187, #247, #301, and #370

See merge request !1301

Player-Colored Elemental Fire for competitive gametypes

See merge request !1312

Fix double free occuring when unloading the intermission patches

See merge request STJr/SRB2!1304

Final lap text for circuit

See merge request STJr/SRB2!1303

Fix SPC looping on libgme versions >= 0.6.3

See merge request !1302