# Conflicts:
#	extras/conf/udb/Includes/SRB222_misc.cfg
#	src/p_spec.h

# Conflicts:
#	src/hardware/hw_main.c
#	src/lua_maplib.c
#	src/p_spec.c
#	src/p_user.c

Blentran - updated

See merge request STJr/SRB2!1656

Several changes to default control settings

See merge request !1682

Improve OpenGL GDI Generic error message

See merge request STJr/SRB2!1673

Fix 2.2.10 pre1 rollangle crash (resolves #747)

Closes #747

See merge request STJr/SRB2!1707

Speed up taglist creation

See merge request !1702

Add collision check for flipped water drops

Closes #735

See merge request !1697

- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit

Make linedef 96 apply to tags from 97-99, but not to itself

See merge request !1633

Fix enemy/boss/minecart explosions in death pits (Closes #67)

Closes #67

See merge request !1688

Allow changing the master server address while hosting a netgame

Closes #329

See merge request !1687

Give the inverted flashpal a constant

See merge request STJr/SRB2!1685

Don't count bots in playersforexit

See merge request !1684

Some hud fixes (by Confusion)

See merge request !1670

Don't award end-of-level bonuses to Tailsbot

See merge request !1676