# Conflicts:
#	src/dehacked.c
#	src/dehacked.h

Fix PlayerCmd not handling angle and aiming correctly

See merge request !1265

Only call the Lua API for overridden actions

See merge request !1254

Split dehacked.c into multiple files.

See merge request !1222

Some fixes for spritestuff2

See merge request !1264

Fix a dumb typo of luaL_checklstring i made whoops

See merge request !1266

Make several Lua global variables writable.

See merge request !1233

Improved sprite sorting against 3d floors

See merge request STJr/SRB2!1235

Can't use gz/gzt because there is no transformation to make those work
differently for splats.

Flame Shield & Thunder Shield Adjustment (Closes #363)

Closes #363

See merge request STJr/SRB2!1220

Made height/spinheight and height change values in replays more accurate

See merge request STJr/SRB2!1241

Make the replay camera follow the player

See merge request !1243

Remove unused music type enums

See merge request STJr/SRB2!1253

Uncap palette lump palettes & allow flashpal palettes to display during pause

See merge request STJr/SRB2!1255

Echo filenames when compiling without ECHO=1

See merge request STJr/SRB2!1260

New sprite features

See merge request !1257

Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations

Use SDL version of executable icon at runtime on macOS

See merge request STJr/SRB2!1250