Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10603


Ignore:
Timestamp:
Sep 27, 2015, 10:29:59 PM (5 years ago)
Author:
landauf
Message:

cleanup: empty level is empty again & tabs→spaces.

Location:
code/branches/ParticleEffectsFS15
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ParticleEffectsFS15/data/DefaultResources.oxr

    r10428 r10603  
    1010    <ResourceLocation path = "gui/schemes" />
    1111    <ResourceLocation path = "gui/scripts" />
    12    
    1312</ResourceCollection>
  • code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw

    r10433 r10603  
    1313
    1414<?lua
    15   include("templates/spaceshipAssff.oxt")
     15  include("templates/spaceshipAssff2.oxt")
    1616  include("templates/spaceshipPirate.oxt")
    1717  include("templates/spaceshipEscort.oxt")
     
    3030
    3131    <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 />
    4133   
    4234  </Scene>
  • code/branches/ParticleEffectsFS15/src/external/CMakeLists.txt

    r10428 r10603  
    2727ADD_SUBDIRECTORY(gtest)
    2828ADD_SUBDIRECTORY(loki)
    29 
    3029IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)
    3130  ADD_SUBDIRECTORY(ogreceguirenderer)
  • code/branches/ParticleEffectsFS15/src/modules/weapons/projectiles/Rocket.cc

    r10428 r10603  
    8686           
    8787            // Add Particle Universe Effects
    88                 //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
    89                 //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
    90                 //this->attachOgreObject(pSys1);
     88            //ParticleUniverse::ParticleSystemManager* pManager = ParticleUniverse::ParticleSystemManager::getSingletonPtr();
     89            //ParticleUniverse::ParticleSystem* pSys1 = pManager->createParticleSystem("pSys1", "bubbles", this->getScene()->getSceneManager());
     90            //this->attachOgreObject(pSys1);
    9191
    9292            this->enableCollisionCallback();
  • code/branches/ParticleEffectsFS15/src/orxonox/worldentities/CMakeLists.txt

    r10428 r10603  
    1212  SpawnPoint.cc
    1313  TeamSpawnPoint.cc
    14  
    1514)
    1615
Note: See TracChangeset for help on using the changeset viewer.