# 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 !1544

Add player mobj check to P_PlayerInPain (resolves #640)

Closes #640

See merge request !1587

Add a missing scale assignment to A_Boss3ShockThink

See merge request !1588

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

Closes #589

See merge request !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 !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 !1606