Reload mapmarks when a mark is removed to make room for new marks
Add missing header
Use proper buffer size in memset, not the size of the pointer.
Stop crash when encyclopedia fails to load.
Add item descriptions to items quickbar.
Nicer placement of quickbar item description text.  Use #def for quickbar window len.
Additional sounds for storage window.
New option to the npc dialogue, name menu. Set a map mark using the name. The format can be changed with a HUD option.
Merge remote-tracking branch 'upstream/master'
 * Fixes for OpenMP and water shader