- Timestamp:
- Sep 27, 2015, 10:29:59 PM (9 years ago)
- Location:
- code/branches/ParticleEffectsFS15
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ParticleEffectsFS15/data/DefaultResources.oxr
r10428 r10603 10 10 <ResourceLocation path = "gui/schemes" /> 11 11 <ResourceLocation path = "gui/scripts" /> 12 13 12 </ResourceCollection> -
code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw
r10433 r10603 13 13 14 14 <?lua 15 include("templates/spaceshipAssff .oxt")15 include("templates/spaceshipAssff2.oxt") 16 16 include("templates/spaceshipPirate.oxt") 17 17 include("templates/spaceshipEscort.oxt") … … 30 30 31 31 <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> 32 <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> 33 34 35 36 <SpaceShip position="0,500,500" lookat="0,0,0" team=1 > 37 <templates> 38 <Template link=spaceshipassff /> 39 </templates> 40 </SpaceShip> 32 <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort /> 41 33 42 34 </Scene> -
code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt
r10428 r10603 27 27 ADD_SUBDIRECTORY(gtest) 28 28 ADD_SUBDIRECTORY(loki) 29 30 29 IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED) 31 30 ADD_SUBDIRECTORY(ogreceguirenderer) -
code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc
r10428 r10603 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/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt
r10428 r10603 12 12 SpawnPoint.cc 13 13 TeamSpawnPoint.cc 14 15 14 ) 16 15
Note: See TracChangeset
for help on using the changeset viewer.