# added health reduction to projectile # changed ints to floats in
edgeDetection.frag for downward compatibility # fixed character spawn in
corner after shooting arrow
Merge remote-tracking branch 'origin/master'

Conflicts:
	gdx-bunny-brawl/src/main/resources/data/shaders/edgeDetection.frag