# Conflicts:
#	src/g_game.c

Put the (pull request repo owner) branch and commit in Appveyor EXE names

See merge request STJr/SRB2!725

Credit Tatsuru

See merge request STJr/SRB2!728

Fix fire shield being removed under lava

See merge request STJr/SRB2!729

Fix garbage fade on Sonic's ass in OpenGL

See merge request STJr/SRB2!715

Let clients rejoin the server without losing their status

See merge request STJr/SRB2!722

Don't set controls to keys of array bounds

See merge request STJr/SRB2!723

Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil

See merge request STJr/SRB2!719

MUSICDEF cleanup, fixes, and VERSION directive to opt into new format

See merge request STJr/SRB2!708

Fix "cam2_turnmultiplier" being unused in "next"

See merge request STJr/SRB2!713

Fix "cam2_turnmultiplier"

See merge request STJr/SRB2!711

Fix P_AddLevelFlatRuntime again

See merge request STJr/SRB2!717

Fix mouse in controls setup menu

See merge request STJr/SRB2!706

This lets the host manually remove a body if they want,
without polluting the chat with redundant messages.

srb2win-jameds-appveyor-exename-b1d931d4.exe

srb2win-jameds:appveyor-exename-b1d931d4.exe

srb2win-master-a6d49eaa.exe

srb2win-master-a6d49eaa.exe

Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.

Shout-out to TAG's config that somehow had
`setcontrol2 "custom3" "KEY931926528"`, cuasing the game to crash only in
Splitscreen.

The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...

# Conflicts:
#	src/g_game.c
#	src/p_setup.c

This is accomplished by simply preserving
the player's body after disconnecting.

Bodies will despawn after the number of minutes
specified by the "rejointimeout" console variable (float).
A value of 0 disables the feature completely.

Clients rejoining are identified by their IP address,
and may rejoin even if the server is full or joins are disabled,
for as long as their body remains.

From a technical standpoint, when the user disconnects,
the player they were controlling does not leave,
the underlying player_t just keeps working normally,
except it does not receive any input anymore.
When the user reconnects, they are simply "relinked"
to their player_t.

Those "soulless" players can be identified through
their "quittime" field, which is the number of tics
elapsed since the user disconnected, or zero
if still connected. "quittime" is exposed to Lua.