* To do: Update Visual Studio .lib files

# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c

update XPM icon

See merge request STJr/SRB2!267

Change default sound volume

See merge request STJr/SRB2!238

Lua sector names fix

See merge request STJr/SRB2!263

SDL Mixer fixes

Closes #31

See merge request STJr/SRB2!260

Horizon line HOM fix

See merge request STJr/SRB2Internal!152

Fix white being treated as transparent.

See merge request STJr/SRB2!266

Polyobject sky plane crash fix

See merge request STJr/SRB2Internal!146

Leveltitle tinkering

See merge request STJr/SRB2Internal!134

# Conflicts:
#	src/hu_stuff.h

Woops! All trans

See merge request !265

NiGHTS: Handle sphere damage correctly upon timeout
* Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP
* Handle player->spheres and player->rings consistently

See merge request STJr/SRB2Internal!157

NiGHTS fix lap detection on inverted axis

See merge request STJr/SRB2Internal!138

Opting to handle this transparently via the Rings menu option. Doesn't seem worth making a separate entry for Spheres.

Hardcoding time again

See merge request STJr/SRB2Internal!130

Fixed sphere spill bug where no spheres spill if player->rings is 0

There may not be a point to this, other than to be consistent with how spheres are tracked. If non-special stage NiGHTS should tally a ring bonus, this may be useful.

player->rings appears to be used for ring/star pickups. Player never loses stars, so it seems player->rings should not be deducted in-level.

Therefore, just deduct player->spheres.