Changeset 6222 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/story_entities/debug_world.cc (modified) (1 diff)
• src/story_entities/network_world.cc (modified) (1 diff)
• src/story_entities/world.cc (modified) (3 diffs)

trunk/src/story_entities/debug_world.cc

@@ -48 +48 @@
 
 #include "glmenu_imagescreen.h"
-#include "list.h"
 #include "game_loader.h"
 

trunk/src/story_entities/network_world.cc

@@ -48 +48 @@
 
 #include "glmenu_imagescreen.h"
-#include "list.h"
 #include "game_loader.h"
 

trunk/src/story_entities/world.cc

@@ -46 +46 @@
 
 #include "glmenu_imagescreen.h"
-#include "list.h"
 #include "game_loader.h"
 
@@ -348 +347 @@
 //  tn->addChild(this->localCamera);
   localCamera->setClipRegion(1, 10000.0);
-  localCamera->lookAt(playable);
+//  localCamera->lookAt(playable);
 //  this->localPlayer->setParentMode(PNODE_ALL);
   if (sky != NULL)
@@ -356 +355 @@
   }
 
+  this->localCamera->getTarget()->getParent()->debugNode(0);
   SoundEngine::getInstance()->setListener(this->localCamera);