# Conflicts:
#	src/d_netcmd.c
#	src/lua_baselib.c
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

* Declared I_SetSongPosition, I_GetSongPosition
* Implemented S_PositionMusic and S_GetPositionMusic
* Exposed in console TUNES and lua
* Implemented set position in SDL, SDL12, WIN32
* Implemented get position in WIN32

# Conflicts:
#	src/nds/i_sound.c
#	src/sdl12/mixer_sound.c
#	src/sdl12/sdl_sound.c
#	src/win32ce/win_snd.c

Horizon line HOM fix

See merge request STJr/SRB2Internal!152

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.

Transparency? I hardly knew 'er!

See merge request !264

Change the order of operations when applying transparency and colormap such that colormap isn't applied to the screen pixel twice (or, in the case of R_DrawTranslatedTranslucentColumn_8, thrice).

Please note I haven't touched the ASM equivalent, given as it's not actually used.

Fixes for archiving/unarchiving Lua strings in netgames

See merge request !262

Password fix hotfix

See merge request !261

This now means:
* Lua strings longer than 1024 chars can now be read properly without awful crashes
* Lua strings with embedded zeros can be written/read without truncating anything (hopefully)

Quick fix for LJ's password fix: don't check if password is set until we've confirmed that the receiving player is the server!

(or, in other words, fixing this to be the same as the equivalent state in the original SOC)

PK3 WAD Map NoReload hotfix

See merge request STJr/SRB2Internal!148

# Conflicts:
#	src/hardware/hw_md2.c

GME low volume fix

See merge request !248

Fix pausing on gme

See merge request !251