# Conflicts:
#	src/r_data.c

Prevent just anyone from skipping credits but allow admins

See merge request STJr/SRB2!478

Pk3 Leaks

See merge request STJr/SRB2!500

Stand(alone) lump comedy

See merge request STJr/SRB2!499

FOF slopes level load fix

See merge request STJr/SRB2!498

Part 2 of fix, make sure copied slopes also pass on hasslope status to attached target sectors for FOFs

Also fix whitespace to use tab-style spaces instead of regular spaces, ew

Fix FOF slopes briefly glitching on level load in software mode, by ensuring the FOFs' target sectors have hasslope set on creation

opengl apng fix

See merge request STJr/SRB2!497

Update version to 2.1.24

See merge request STJr/SRB2!495

# Conflicts:
#	debian-template/control
#	debian/changelog

Add GME to MSVC 10 solution

See merge request STJr/SRB2!448

Deploy OS X and Debian packages from Travis-CI

See merge request STJr/SRB2!449

# Conflicts:
#	.travis.yml

Flashpals on screenshots

See merge request STJr/SRB2!492

Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines.

See merge request STJr/SRB2!490

Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456

Don't skip frames when connecting or paused

See merge request STJr/SRB2!489

This reverts commit 7ac0a8b4.

Alias recursion hotfix 2

See merge request STJr/SRB2!482

Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486