# 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