# Conflicts:
#	src/p_user.c

Ban IP command

See merge request !460

Don't count down wait timer when executing a command line

See merge request !483

OpenGL Sprite Billboarding

See merge request STJr/SRB2!485

add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason

not making a merge request because this is so laughably stupidly simple

Don't enable UPnP support if NONET is defined.

See merge request !484

Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.

Console quality of life changes

See merge request !479

Keep console open in certain instances

See merge request !480

Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.

jameds authored 7 years ago and James R. committed 6 years ago

And this works by inserting the same color code on each wrapped line.

Buildbot changes

See merge request !477

Dedicated server credits fix

See merge request !476

MI's side discolor fix

See merge request !475

Gametype strings backport

See merge request !473

Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way