Changeset 10618 for code/branches/presentationFS15merge
- Timestamp:
- Oct 4, 2015, 2:23:33 PM (9 years ago)
- Location:
- code/branches/presentationFS15merge/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentationFS15merge/src/libraries/network/WANDiscovery.cc
r10612 r10618 164 164 165 165 std::string WANDiscovery::getServerListItemRTT(unsigned int index) 166 166 { 167 167 if( index >= this->servers_.size() ) 168 168 return BLANKSTRING; -
code/branches/presentationFS15merge/src/modules/weapons/projectiles/RocketOld.cc
r10613 r10618 86 86 87 87 // Add Particle Universe Effects 88 89 90 88 //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr(); 89 //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager()); 90 //this->attachOgreObject(pSys1); 91 91 92 92 this->enableCollisionCallback(); -
code/branches/presentationFS15merge/src/orxonox/controllers/testscript.lua
r10262 r10618 1 print 1 print ('1: Hello World')
Note: See TracChangeset
for help on using the changeset viewer.