Merge remote branch 'gus/collisions' into collision

actorid
Marc Zinnschlag 14 years ago
commit 8788dcebcf

@ -175,12 +175,14 @@ void MWScene::toggleCollisionMode()
if(cmode) if(cmode)
{ {
act->enableCollisions(false); act->enableCollisions(false);
act->setGravity(0); act->setGravity(0.);
act->setVerticalVelocity(0);
} }
else else
{ {
act->enableCollisions(true); act->enableCollisions(true);
act->setGravity(10); act->setGravity(10.);
act->setVerticalVelocity(0);
} }
} }
} }

Loading…
Cancel
Save