Merge branch 'master' into GUI

src/Engine/core/worldToric.cpp

@@ -86,9 +86,9 @@ void WorldToric::DoStep_MoveAllAgents()
 			x -= width_;
 		else if (x < -halfWidth)
 			x += width_;
-		if (y > halfWidth)
+		if (y > halfHeight)
 			y -= height_;
-		else if (y < -halfWidth)
+		else if (y < -halfHeight)
 			y += height_;
 
 		agent->setPosition(Vector2D(x,y));