Changeset 10618 for code/branches

Timestamp:

Oct 4, 2015, 2:23:33 PM (9 years ago)

Author:

landauf

Message:

tabs → spaces

Location:

code/branches/presentationFS15merge/src

Files:

• libraries/network/WANDiscovery.cc (modified) (1 diff)
• modules/weapons/projectiles/RocketOld.cc (modified) (1 diff)
• orxonox/controllers/testscript.lua (modified) (1 diff)

code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc

@@ -164 +164 @@
 
   std::string WANDiscovery::getServerListItemRTT(unsigned int index)
-        {
+  {
     if( index >= this->servers_.size() )
       return BLANKSTRING;

code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc

@@ -86 +86 @@
             
             // Add Particle Universe Effects
-                //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
-                //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
-                //this->attachOgreObject(pSys1);
+            //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
+            //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
+            //this->attachOgreObject(pSys1);
 
             this->enableCollisionCallback();

code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua

@@ -1 @@
-print   ('1: Hello World')
+print ('1: Hello World')