Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6389 for code/branches


Ignore:
Timestamp:
Dec 21, 2009, 1:45:56 PM (15 years ago)
Author:
rgrieder
Message:

Found some inappropriate tabs.

Location:
code/branches/presentation2
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2/data/levels/includes/weaponsettings_HXY.oxi

    r6363 r6389  
    1616          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
    1717          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
    18             <LightningGun mode=1 muzzleoffset="0,0,0" />
     18          <LightningGun mode=1 muzzleoffset="0,0,0" />
    1919        </Weapon>
    2020        <Weapon>
    2121          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
    2222          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
    23             <LightningGun mode=1 muzzleoffset="0,0,0" />
     23          <LightningGun mode=1 muzzleoffset="0,0,0" />
    2424        </Weapon>
    2525      </WeaponPack>

  • code/branches/presentation2/data/levels/includes/weaponsettings_Transporter.oxi

    r6363 r6389  
    1616          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
    1717          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
    18             <LightningGun mode=1 muzzleoffset="0,0,0" />
     18          <LightningGun mode=1 muzzleoffset="0,0,0" />
    1919        </Weapon>
    2020        <Weapon>
    2121          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
    2222          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
    23             <LightningGun mode=1 muzzleoffset="0,0,0" />
     23          <LightningGun mode=1 muzzleoffset="0,0,0" />
    2424        </Weapon>
    2525      </WeaponPack>

  • code/branches/presentation2/data/levels/includes/weaponsettings_ghost.oxi

    r6287 r6389  
    1616          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
    1717          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
    18             <LightningGun mode=1 muzzleoffset="0,0,0" />
     18          <LightningGun mode=1 muzzleoffset="0,0,0" />
    1919        </Weapon>
    2020        <Weapon>
    2121          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
    2222          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
    23             <LightningGun mode=1 muzzleoffset="0,0,0" />
     23          <LightningGun mode=1 muzzleoffset="0,0,0" />
    2424        </Weapon>
    2525      </WeaponPack>

  • code/branches/presentation2/data/levels/old/physicstest2.oxw

    r5929 r6389  
    2121    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
    2222
    23         <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
    24         <StaticEntity
     23    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
     24    <StaticEntity
    2525     position        = "0,0,0"
    2626     name            = "banana"
    … …  
    3535        <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
    3636      </collisionShapes>
    37         </StaticEntity>
    38 
    39         <!-- red sphere for phsics engine testing purposes-->
    40         <!--StaticEntity position="40,0,0">
    41                 <attached>
    42                         <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
    43                 </attached>
    44         </StaticEntity-->
    45 
    46         <!-- yellow cube for phsics engine testing purposes-->
    47         <!--StaticEntity position="80,0,0">
     37    </StaticEntity>
     38
     39    <!-- red sphere for phsics engine testing purposes-->
     40    <!--StaticEntity position="40,0,0">
     41      <attached>
     42        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
     43      </attached>
     44    </StaticEntity-->
     45
     46    <!-- yellow cube for phsics engine testing purposes-->
     47    <!--StaticEntity position="80,0,0">
    4848      <attached>
    4949        <Model position="0,0,0" scale=1 mesh="cube.mesh" />
    5050      </attached>
    51         </StaticEntity-->
     51    </StaticEntity-->
    5252
    5353    <MovableEntity

  • code/branches/presentation2/data/levels/old/presentation_physics.oxw

    r5781 r6389  
    3030        <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
    3131      </collisionShapes>
    32         </StaticEntity>
     32    </StaticEntity>
    3333
    34         <MovableEntity
     34    <MovableEntity
    3535     position        = "0,250,500"
    3636     rotationaxis    = "1, 1, 1"
    … …  
    6464        <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    6565      </collisionShapes>
    66         </MovableEntity>
     66    </MovableEntity>
    6767
    6868    <?lua

  • code/branches/presentation2/data/levels/old/princessaeryn.oxw

    r5929 r6389  
    66
    77<?lua
    8         dofile("includes/CuboidSpaceStation.lua")
     8    dofile("includes/CuboidSpaceStation.lua")
    99?>
    1010
    1111<NotificationQueue
    12         name  = "notification"
    13         position = "1.0, 1.0"
    14         targets = "questsystem"
     12 name  = "notification"
     13 position = "1.0, 1.0"
     14 targets = "questsystem"
    1515/>
    1616

  • code/branches/presentation2/data/levels/old/questsystem.oxw

    r5781 r6389  
    66
    77<NotificationQueue
    8         name  = "notification"
    9         position = "1.0, 1.0"
    10         targets = "all"
     8 name  = "notification"
     9 position = "1.0, 1.0"
     10 targets = "all"
    1111/>
    1212
    … …  
    2929        </GlobalQuest>
    3030
    31                                 <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
    32                                   <events>
    33                                     <spawn>
    34                                       <EventTrigger delay=1>
    35                                         <events>
    36                                           <trigger>
    37                                             <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
    38                                           </trigger>
    39                                         </events>
    40                                       </EventTrigger>
    41                                     </spawn>
    42                                   </events>
    43                                 </ParticleSpawner>
     31        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
     32            <events>
     33                <spawn>
     34                    <EventTrigger delay=1>
     35                        <events>
     36                            <trigger>
     37                                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
     38                            </trigger>
     39                        </events>
     40                    </EventTrigger>
     41                </spawn>
     42            </events>
     43        </ParticleSpawner>
    4444
    4545        <QuestEffectBeacon position="0,0,100" times=-1>

  • code/branches/presentation2/data/levels/old/sample4.oxw

    r5929 r6389  
    2323        <Model position="0,0,0" scale=10 mesh="satellite.mesh" />
    2424        <MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
    25           <attached>
     25          <attached>
    2626            <Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
    2727          </attached>
    28         </MovableEntity>
     28        </MovableEntity>
    2929        <ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
    3030        <ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />

  • code/branches/presentation2/data/levels/presentation.oxw

    r5929 r6389  
    2020
    2121
    22         <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
    23         <!--StaticEntity position="0,0,0">
    24                 <attached>
    25                         <Model position="0,0,0" scale=1 mesh="axes.mesh" />
    26                 </attached>
    27         </StaticEntity -->
     22    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
     23    <!--StaticEntity position="0,0,0">
     24      <attached>
     25        <Model position="0,0,0" scale=1 mesh="axes.mesh" />
     26      </attached>
     27    </StaticEntity -->
    2828
    29         <!-- red sphere for phsics engine testing purposes-->
    30         <!--StaticEntity position="40,0,0">
    31                 <attached>
    32                         <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
    33                 </attached>
    34         </StaticEntity-->
     29    <!-- red sphere for phsics engine testing purposes-->
     30    <!--StaticEntity position="40,0,0">
     31      <attached>
     32        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
     33      </attached>
     34    </StaticEntity-->
    3535
    36         <!-- yellow cube for phsics engine testing purposes-->
    37         <!--StaticEntity position="80,0,0">
    38                 <attached>
    39                         <Model position="0,0,0" scale=1 mesh="cube.mesh" />
    40                 </attached>
    41         </StaticEntity-->
     36    <!-- yellow cube for phsics engine testing purposes-->
     37    <!--StaticEntity position="80,0,0">
     38      <attached>
     39        <Model position="0,0,0" scale=1 mesh="cube.mesh" />
     40      </attached>
     41    </StaticEntity-->
    4242
    43         <!-- Carrier with guns not implemented yet -->
    44         <MovableEntity position="-2000,-1000,-2000" pitch="-90" roll="90">
     43    <!-- Carrier with guns not implemented yet -->
     44    <MovableEntity position="-2000,-1000,-2000" pitch="-90" roll="90">
    4545      <attached>
    4646        <Model position="0,0,0" scale=10 mesh="Carrier.mesh" />
    47                 <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
     47        <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
    4848        <Model position="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
    4949      </attached>
    … …  
    5454        <Model position="0,0,0" scale=10 mesh="satellite.mesh" />
    5555        <MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
    56           <attached>
     56          <attached>
    5757            <Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
    5858          </attached>
    59         </MovableEntity>
     59        </MovableEntity>
    6060        <ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
    6161        <ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />

  • code/branches/presentation2/data/levels/presentationHS09.oxw

    r6388 r6389  
    347347elements = {"asteroid_ice.mesh", "asteroid_UV.mesh", "ast1.mesh", "ast2.mesh", "ast3.mesh", "ast4.mesh", "ast5.mesh", "ast6.mesh"}
    348348elements.length = function()
    349         return table.getn(elements)
     349    return table.getn(elements)
    350350end
    351351for i = 1, 100, 1

  • code/branches/presentation2/data/levels/presentationHS09b.oxw

    r6382 r6389  
    4141        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_UV.mesh" />
    4242      </attached>
    43         <collisionShapes>
    44                 <SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
    45         </collisionShapes>
     43      <collisionShapes>
     44        <SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
     45      </collisionShapes>
    4646    </MovableEntity>
    4747     <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
    … …  
    6969      </attached>
    7070    </MovableEntity>
    71         <?lua
    72         end
    73         ?>
     71<?lua
     72end
     73?>
    7474<?lua
    7575for i = 1,12, 1
    … …  
    8181      </templates>
    8282      <controller>
    83         <WaypointPatrolController alertnessradius=4000 team=0 active=true>
     83        <WaypointPatrolController alertnessradius=4000 team=0 active=true>
    8484          <waypoints>
    8585            <StaticEntity position="5000,<?lua print(math.random()*50)?> ,<?lua print(i*50 -150) ?>" />
    … …  
    9696      </templates>
    9797      <controller>
    98         <WaypointPatrolController name=pirate  target=pirate alertnessradius=1000 team=0 active=false>
     98        <WaypointPatrolController name=pirate  target=pirate alertnessradius=1000 team=0 active=false>
    9999          <waypoints>
    100100            <StaticEntity position="5000,100,1100" />
    … …  
    197197   ?>
    198198
    199 <MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
     199    <MovableEntity collisiontype=dynamic mass=<?lua print(s*10)?> position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
    200200      <attached>
    201201        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="asteroid_ice.mesh" />
    202202      </attached>
    203         <collisionShapes>
    204                 <SphereCollisionShape radius="<?lua print(s*0.9)?>" />
    205         </collisionShapes>
     203      <collisionShapes>
     204        <SphereCollisionShape radius="<?lua print(s*0.9)?>" />
     205      </collisionShapes>
    206206    </MovableEntity>
    207      <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
     207    <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
    208208<?lua
    209209end
    … …  
    212212      <targets>
    213213        <EventTarget target=attack />
    214         <EventTarget target=wait />
     214        <EventTarget target=wait />
    215215      </targets>
    216216      <events>
    … …  
    258258
    259259
    260 <AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="false">
    261        <events>
    262           <activity>
    263              <DistanceTrigger position="2000,0,0" distance=500 target="Camera" />
    264           </activity>
    265        </events>
     260    <AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="false">
     261      <events>
     262        <activity>
     263          <DistanceTrigger position="2000,0,0" distance=500 target="Camera" />
     264        </activity>
     265      </events>
    266266    </AmbientSound>
    267267

  • code/branches/presentation2/data/levels/princessaeryn.oxw

    r5929 r6389  
    66
    77<?lua
    8         dofile("includes/CuboidSpaceStation.lua")
     8    dofile("includes/CuboidSpaceStation.lua")
    99?>
    1010

  • code/branches/presentation2/data/levels/sound.oxw

    r6387 r6389  
    2020  <AmbientSound ambientSource="Earth.ogg" looping="true" playOnLoad="true" />
    2121  <AmbientSound ambientSource="Mars.ogg" looping="true">
    22         <events>
    23                 <activity>
    24                         <DistanceTrigger position="400,0,0" distance=200 target="Camera">
    25                                 <attached>
    26                                         <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
    27                                 </attached>
    28                         </DistanceTrigger>
    29                 </activity>
    30         </events>
     22    <events>
     23        <activity>
     24            <DistanceTrigger position="400,0,0" distance=200 target="Camera">
     25                <attached>
     26                    <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
     27                </attached>
     28            </DistanceTrigger>
     29        </activity>
     30    </events>
    3131  </AmbientSound>
    3232  <AmbientSound ambientSource="Jupiter.ogg" looping="true">
    33         <events>
    34                 <activity>
    35                         <DistanceTrigger position="400,150,0" distance=200 target="Camera">
    36                                 <attached>
    37                                         <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
    38                                 </attached>
    39                         </DistanceTrigger>
    40                 </activity>
    41         </events>
     33    <events>
     34        <activity>
     35            <DistanceTrigger position="400,150,0" distance=200 target="Camera">
     36                <attached>
     37                    <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
     38                </attached>
     39            </DistanceTrigger>
     40        </activity>
     41    </events>
    4242  </AmbientSound>
    4343

  • code/branches/presentation2/data/levels/templates/spaceship_ghost.oxt

    r6357 r6389  
    7474    <EffectContainer condition="not idle">
    7575      <Backlight mainstate=activity active=false scale=0.4 position="7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    76         <Backlight mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     76      <Backlight mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    7777    </EffectContainer>
    7878    <EffectContainer condition="brake">

  • code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc

    r6387 r6389  
    6666            Model* model = new Model(this);
    6767            model->setMeshSource("rocket.mesh");
    68                         model->scale(0.7);
     68            model->scale(0.7);
    6969            this->attach(model);
    7070            ParticleEmitter* fire = new ParticleEmitter(this);
Note: See TracChangeset for help on using the changeset viewer.