Merge remote-tracking branch 'upstream/master'

apps/openmw/mwgui/console.cpp

@@ -28,12 +28,6 @@ namespace MWGui
 
     bool Console::compile (const std::string& cmd, Compiler::Output& output)
     {
-
-  listNames();
-  for (std::vector<std::string>::iterator iter (mNames.begin()); iter!=mNames.end(); ++iter)
-    std::cout << *iter << ", ";
-  std::cout << std::endl;
-
         try
         {
             ErrorHandler::reset();

apps/openmw/mwrender/mwscene.cpp

@@ -155,6 +155,7 @@ void MWScene::addActor (const std::string& handle, const std::string& mesh,
 void MWScene::removeObject (const std::string& handle)
 {
 	//TODO:check if actor???
+    eng->removeCharacter(handle);
 	eng->removeRigidBody(handle);
 	eng->deleteRigidBody(handle);
 }

apps/openmw/mwworld/world.cpp

@@ -453,8 +453,6 @@ namespace MWWorld
         delete mPlayer;
         delete mSkyManager;
         delete mGlobalVariables;
-
-		//delete mPhysEngine;
     }
 
     MWWorld::Player& World::getPlayer()

components/nifbullet/bullet_nif_loader.cpp

@@ -133,7 +133,6 @@ void ManualBulletShapeLoader::loadResource(Ogre::Resource *resource)
     //if collide = false, then it does a second pass which create a shape for raycasting.
     if(cShape->collide == false)
     {
-        std::cout << "collide = false "<<resourceName << std::endl;
 	    handleNode(node,0,Ogre::Matrix3::IDENTITY,Ogre::Vector3::ZERO,1,hasCollisionNode,false,true);                               
     }
 }
@@ -306,7 +305,6 @@ void ManualBulletShapeLoader::handleNiTriShape(Nif::NiTriShape *shape, int flags
 	}
 	NodeShape = new btBvhTriangleMeshShape(mTriMesh,true);
 	currentShape->addChildShape(tr,NodeShape);
-    std::cout << "tri";
 }
 
 void ManualBulletShapeLoader::load(const std::string &name,const std::string &group)

libs/openengine

@@ -1 +1 @@
-Subproject commit 1ce6405e2bf5388a05a5cc0a60d1c5fe3dcadbfb
+Subproject commit 32b475432f3e1c8d7275d17da0d692c173f30478