Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2018, 12:03:52 AM (6 years ago)
Author:
landauf
Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:
code/branches/cegui0.8_ogre1.9
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw

    r11104 r11795  
    930930    ?>
    931931
    932     <Planet
     932    <MovableEntity
    933933        position="<?lua printC(cPlanet1) ?>"
    934934        scale="2000"
    … …  
    938938        mass="5000000"
    939939        pitch="0"
    940         mesh="planets/muunilinst.mesh"
    941         atmosphere="atmosphere1"
    942940        rotationaxis="1,0,0"
    943941        rotationrate="1.0"
    944         atmospheresize="80.0f"
    945         imagesize="1024.0f"
    946942        collisiondamage = 2
    947943        enablecollisiondamage = true
    948       >
     944    >
    949945      <attached>
    950         <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
    951         </attached>
    952           <collisionShapes>
    953             <SphereCollisionShape radius="2000" position="0,0,0" />
     946        <Planet
     947            mesh="planets/muunilinst.mesh"
     948            atmosphere="atmosphere1"
     949            atmospheresize="80.0f"
     950            imagesize="1024.0f"
     951        >
     952          <attached>
     953            <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
     954          </attached>
     955        </Planet>
     956      </attached>
     957      <collisionShapes>
     958        <SphereCollisionShape radius="2000" position="0,0,0" />
    954959      </collisionShapes>
    955     </Planet>
     960    </MovableEntity>
    956961
    957962    <?lua
    … …  
    960965    ?>
    961966
    962     <Planet
     967    <MovableEntity
    963968        position="<?lua printC(cPlanet2) ?>"
    964969        scale="3000"
    … …  
    968973        mass="5000000"
    969974        pitch="0"
    970         mesh="planets/planet3.mesh"
    971         atmosphere="atmosphere1"
    972975        rotationaxis="1,0,0"
    973976        rotationrate="1.0"
    974         atmospheresize="80.0f"
    975         imagesize="1024.0f"
    976977        collisiondamage = 2
    977978        enablecollisiondamage = true
    978       >
     979    >
    979980      <attached>
    980         <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
    981         </attached>
    982           <collisionShapes>
    983             <SphereCollisionShape radius="3000" position="0,0,0" />
     981        <Planet
     982            mesh="planets/planet3.mesh"
     983            atmosphere="atmosphere1"
     984            atmospheresize="80.0f"
     985            imagesize="1024.0f"
     986          >
     987          <attached>
     988            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
     989          </attached>
     990        </Planet>
     991      </attached>
     992      <collisionShapes>
     993        <SphereCollisionShape radius="3000" position="0,0,0" />
    984994      </collisionShapes>
    985     </Planet>
     995    </MovableEntity>
    986996
    987997    <?lua
Note: See TracChangeset for help on using the changeset viewer.