Changeset 6417 for code/trunk/src/orxonox/controllers/Controller.cc

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/Controller.cc (modified) (2 diffs)

code/trunk/src/orxonox/controllers/Controller.cc

@@ -29 +29 @@
 #include "Controller.h"
 #include "core/CoreIncludes.h"
+#include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -40 +41 @@
         this->player_ = 0;
         this->controllableEntity_ = 0;
+        this->bGodMode_ = false;
     }