Changeset 1208

Timestamp:

Apr 30, 2008, 4:21:27 PM (16 years ago)

Author:

rgrieder

Message:

• merged trunk into branch, but in ONE revision, very important so that you can leave out that revision when merging to trunk.

Location:

code/branches/input

Files:

• cmake/FindTCL.cmake (copied) (copied from code/trunk/cmake/FindTCL.cmake)
• src/orxonox/Orxonox.cc (modified) (1 diff)
• src/util/tolua/tolua_bind.cc (deleted)
• src/util/tolua/tolua_bind.h (deleted)
• src/util/tolua/toluabind_default.h (deleted)

code/branches/input/src/orxonox/Orxonox.cc

@@ -157 +157 @@
   Orxonox::Orxonox()
   {
+    this->mode_ = STANDALONE;
+    this->serverIp_ = "";
     this->ogre_ = &GraphicsEngine::getSingleton();
     this->timer_ = 0;
     this->dataPath_ = "";
     this->auMan_ = 0;
+    this->orxonoxHUD_ = 0;
     this->inputHandler_ = 0;
     // turn on frame smoothing by setting a value different from 0