# Conflicts:
#	src/lua_hooklib.c

PK3: Proper ignorance for file comments/extra data

See merge request !761

Hide record & NiGHTS attack options if there are no available maps for them.

See merge request !868

Allow emblem hints (and radar) in record attack.

See merge request !820

Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.

See merge request !840

BotRespawn hook

See merge request !804

Separate PvP damage from ringslinger

See merge request !831

Only initialise OpenGL if the user intends to load it (for real this time)

See merge request !796

Expose colorization to mappers and SOC

See merge request !679

Change SKINCOLOR_SUPERGOLD1-5

See merge request !805

Don't skip the first directory entry of PK3 if it's a file

See merge request !764

Cvars returned by CV_FindVar did not work with userdataType

See merge request STJr/SRB2!754

Let MUSICDEF set loop point

See merge request STJr/SRB2!762

Skin flag for disabling super colors in NiGHTS

See merge request !782

Lua hook cleanup

See merge request !851

Fix console backpic

See merge request !850

Turn FIXED_TO_FLOAT into a function

See merge request !869

Delete singleplayer

See merge request !870

Fix disconnected players being kicked for high ping

See merge request !866