# Conflicts:
#	src/p_inter.c

Logical comparisons evaluate to a boolean value...

Refactor HUD hooks too

See merge request !1577

This reverts merge request !1532

Expose act number drawing functions to Lua

See merge request !1532

Cut cv_hidetime's minimum value to 1 (resolves #586)

Closes #586

See merge request STJr/SRB2!1544

Add player mobj check to P_PlayerInPain (resolves #640)

Closes #640

See merge request STJr/SRB2!1587

Add a missing scale assignment to A_Boss3ShockThink

See merge request STJr/SRB2!1588

Split up x/y/z averages in A_Boss3ShockThink (resolves #589)

Closes #589

See merge request STJr/SRB2!1538

Add proper parameters to MobjMoveBlocked so you can actually tell what you're being blocked by (Resolves #332)

Closes #332

See merge request STJr/SRB2!1491

Don't call map load trigger linedefs when joining or reloading gamestate

See merge request !1592

Fix minor issues with folder addons

See merge request STJr/SRB2!1617

Replay overwrite fix

See merge request STJr/SRB2!1523

Fix antique ghost netvars

See merge request !1545

Fix issue with png_get_tRNS

See merge request STJr/SRB2!1606

Add VERSIONSTRING_RC to DEVELOP builds for compiler compatibility

Closes #663

See merge request !1607

Remove camera dependency from P_GetPlayerControlDirection

Closes #183

See merge request STJr/SRB2!1512

Fix incorrect error message during Lua archiving

See merge request !1593

Allow Lua write access to camera_t variables & expose the cameras globally

See merge request !1581

Add flag to line slopes for even more slope copying

See merge request STJr/SRB2!1550

Fix gme support being effectively disabled

See merge request STJr/SRB2!1586

Fix #649

Closes #649

See merge request !1604

Polish the Lua input library

See merge request !1598

Implement folder loading

See merge request !1568

Refactor weather switching (fixes #541)

Closes #541

See merge request !1498

V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request !1316

Add generalized slopes in UDMF

See merge request !1530

Make the colormap returned by v.getColormap() writable.

See merge request STJr/SRB2!959

Makefile: Improve gcc detection

See merge request !1608