Fixed Rocket error, Rocket projectile still works if owner dead on 1st step
Release prep
Unbroke Pinkie Promise
Merge pull request #151 from TazeTSchnitzel/releaseprep2.6.1

Gang Garrison 2.6.1
Allow disabling menu music
Revert "Some object ID changes due to conflicts"

This reverts commit a362e247f50aecec4d9685bbf4ce473591f6700b.
Revert Wareya's collision system changes for now

This reverts commits 11183072709511b68ceede48538d73fd33be538b,
bb66c87a7c16f28b0efcb543d06dd19af163ea5a,
dac484a65449c115ab64491d535aa74d0390bc11,
438081c49b4b76f968c6d289049b32403a78e0ff
I forgot one
Merge pull request #152 from TazeTSchnitzel/musicOptions

Allow disabling menu music
Release preparations
Revert "Revert Wareya's collision system changes for now"

This reverts commit 20c32ddbe29a7622e81367ed95e2d5c647fff3b5.
Re-revert the collision overhaul, but correctly this time (fixes bodyblocking)
Release preparations
Merge branch 'master' into collisionAccuracy

Conflicts:
	Source/gg2/Scripts/charFixFringes.gml
	Source/gg2/Scripts/charRunPhysics.gml