# Conflicts:
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/doomdef.h
#	src/g_game.c
#	src/hu_stuff.c
#	src/lua_baselib.c
#	src/m_menu.c
#	src/sdl/i_system.c
#	src/sdl/sdlmain.h

(with log messages)

Controller defaults: Set Ring Toss to right trigger instead of left trigger

See merge request STJr/SRB2!370

Change 2p controller defaults

See merge request STJr/SRB2!369

Let Grow/Shrink revert itself when it changes to 0, as well as add a function for removing either. Means we don't have to modify every single > 0/< 0 check, and is overall cleaner.

Same here

I doubt this hurts anything, but might as well I guess

Beyond a certain threshold, forcefully give 2nd a SPB if one's not already out.

See merge request KartKrew/Kart!119

There is a LOT that can go wrong here, so I'm not gonna make this a priority for v1.0.2. If someone else wants to take a crack at maintaining this though, and fixing any and all inconsistencies, then feel free.

Add OS and 32/64-bitness to VERSION console command

See merge request STJr/SRB2!368

Fix 64-bit build-using admins not being able to kick players besides themselves, by not checking sendingsavegame[] code at all if not the server

it turns out playernode[pn] is typically 255 in the above situation, so sendingsavegame[playernode[pn]] goes out of bounds ...but goodness knows why 32-bit builds didn't suffer the same bug, seems to have been pure luck

It turns out the game was sending the full size of the motd buffer (254) rather than just the size of the string made, therefore sending a load of garbage and making the game apparently execute unknown or illegal net commands

Fix the game being basically broken due to multi-admin, by porting over some missing changes from Kart

Use Joystick 1 and Joystick 2 by default if plugged in

See merge request STJr/SRB2!364

Joystick juggling

See merge request STJr/SRB2!355

Slightly re-organize DLLs and document the required list for bundling

See merge request STJr/SRB2!365

This reverts commit 09e9e2ba.

Make uninstaller a self-extractable

See merge request STJr/SRB2!367