Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 25, 2009, 10:23:58 PM (15 years ago)
Author:
rgrieder
Message:

Merged presentation2 branch back to trunk.
Major new features:

  • Actual GUI with settings, etc.
  • Improved space ship steering (human interaction)
  • Rocket fire and more particle effects
  • Advanced sound framework
Location:
code/trunk
Files:
24 edited
9 copied

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/empty_level.oxw

    r5781 r6417  
    1717    skybox       = "Orxonox/Starbox"
    1818  >
     19
     20<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
     21      <attached>
     22        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
     23          <attached>
     24           <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
     25           <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
     26           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
     27           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
     28          </attached>
     29          </Model>
     30        </attached>
     31    </Rocket-->
     32
     33
    1934    <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" />
    20     <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshippirate />
     35    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
    2136  </Scene>
    2237</Level>

  • code/trunk/data/levels/events.oxw

    • Property svn:eol-style set to native
    r5929 r6417  
    4545      works with all amounts of objects from zero to infinity. In the examples I used two objects each.
    4646    -->
    47      
     47
    4848
    4949    <!-- red -->

  • code/trunk/data/levels/gametype_asteroids.oxw

    r5781 r6417  
    2828?>
    2929
    30     <MovableEntity 
    31      position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"        collisionType=dynamic 
     30    <MovableEntity
     31     position="<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"        collisionType=dynamic
    3232     linearDamping=0.8
    3333     angularDamping=0
    34      scale=<?lua print(j * 150)?> 
     34     scale=<?lua print(j * 150)?>
    3535     collisiondamage=1
    3636     enablecollisiondamage=true>

  • code/trunk/data/levels/includes/weaponsettings3.oxi

    r5781 r6417  
    22      <WeaponSlot position="-15.0,-1.5,0" />
    33      <WeaponSlot position=" 15.0,-1.5,0" />
    4       <WeaponSlot position="  0.0, 0.0,0" />
     4      <WeaponSlot position="    0,   0,0" />
    55    </weaponslots>
    66    <weaponsets>
    77      <WeaponSet firemode=0 />
    88      <WeaponSet firemode=1 />
     9      <WeaponSet firemode=2 />
    910    </weaponsets>
    1011    <weapons>
    … …  
    1314          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
    1415          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
     16          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
    1517        </links>
    1618        <Weapon>
    … …  
    3638          <LightningGun mode=1 muzzleoffset="0,0,0" />
    3739        </Weapon>
     40        <Weapon>
     41          <RocketFire mode=2 muzzleoffset="0,0,0" />
     42        </Weapon>
    3843      </WeaponPack>
    3944      <WeaponPack>
    … …  
    4146          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
    4247        </links>
    43         <Weapon>
    44           <!-- EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" / -->
    45         </Weapon>
     48        <!--Weapon>
     49          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
     50        </Weapon-->
    4651      </WeaponPack>
    4752    </weapons>

  • code/trunk/data/levels/includes/weaponsettings_ghost.oxi

    • Property svn:eol-style set to native
    r5989 r6417  
    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" />
    1819        </Weapon>
    1920        <Weapon>
    2021          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
    2122          <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" />
    2224        </Weapon>
    2325      </WeaponPack>

  • code/trunk/data/levels/old/physicstest.oxw

    r5781 r6417  
    1212
    1313<?lua
    14 for i = 1, 226, 1 
     14for i = 1, 226, 1
    1515do ?>
    1616  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
    17 <?lua 
     17<?lua
    1818end
    1919?>

  • code/trunk/data/levels/old/physicstest2.oxw

    r5929 r6417  
    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/trunk/data/levels/old/presentation_physics.oxw

    r5781 r6417  
    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/trunk/data/levels/old/princessaeryn.oxw

    r5929 r6417  
    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/trunk/data/levels/old/questsystem.oxw

    r5781 r6417  
    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/trunk/data/levels/old/sample4.oxw

    r5929 r6417  
    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/trunk/data/levels/old/spaceshiptemplates_physics.oxw

    r5781 r6417  
    1010   auxilaryThrust    = 30;
    1111   rotationThrust    = 10;
    12    
     12
    1313   collisionType     = "dynamic"
    1414   mass              = 100

  • code/trunk/data/levels/old/tutorial_hs08.oxw

    r5781 r6417  
    1919<!-- Embedded lua code (creates random asteroids) -->
    2020<?lua
    21 for i = 1, 226, 1 
     21for i = 1, 226, 1
    2222do ?>
    2323  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
    24 <?lua 
     24<?lua
    2525end
    2626?>

  • code/trunk/data/levels/presentation.oxw

    r5929 r6417  
    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/trunk/data/levels/presentation09.oxw

    r5781 r6417  
    2424max = 20
    2525for i = 1, max, 1
    26 do 
     26do
    2727    x = math.sin(i/max*6)*40000
    2828    y = math.cos(i/max*6)*40000
    … …  
    3030    ?>
    3131<?lua
    32 for k = 1, 25, 1 
     32for k = 1, 25, 1
    3333do
    3434j = math.random()
    3535?>
    36    
    37     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     36
     37    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    3838      <attached>
    3939        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4343      </collisionShapes> <?lua end ?>
    4444    </MovableEntity>
    45 <?lua 
     45<?lua
    4646end
    4747?>
    4848<?lua end ?>
    4949    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    50    
     50
    5151  </Scene>
    5252</Level>

  • code/trunk/data/levels/presentation09b.oxw

    r5929 r6417  
    8686      </controller>
    8787    </SpaceShip>
    88    
     88
    8989    <PickupSpawner item="JumpItem" triggerDistance="20" respawnTime="10000" position="-3800, 2500, 1500">
    9090        <attached>
    … …  
    9393        </attached>
    9494    </PickupSpawner>
    95    
     95
    9696    <PickupSpawner item="HealthUsableItem" triggerDistance="20" respawnTime="10000" position="-4150,2750,1550">
    9797        <attached>
    … …  
    100100        </attached>
    101101    </PickupSpawner>
    102    
     102
    103103    <PickupSpawner item="HealthImmediateItem" triggerDistance="20" respawnTime="3" position="2300, 4300, 2400">
    104104        <attached>
    … …  
    121121
    122122<?lua
    123 for i = 1, 10, 1 
     123for i = 1, 10, 1
    124124do
    125125?>
    … …  
    136136      </controller>
    137137    </SpaceShip>
    138 <?lua 
    139 end
    140 ?>
    141 
    142 <?lua
    143 for i = 1, 12, 1 
     138<?lua
     139end
     140?>
     141
     142<?lua
     143for i = 1, 12, 1
    144144do
    145145?>
    … …  
    156156      </controller>
    157157    </SpaceShip>
    158 <?lua 
     158<?lua
    159159end
    160160?>
    … …  
    173173
    174174<?lua
    175 for i = 1, 12, 1 
     175for i = 1, 12, 1
    176176do
    177177?>
    … …  
    190190      </controller>
    191191    </SpaceShip>
    192 <?lua 
     192<?lua
    193193end
    194194?>
    … …  
    320320
    321321<?lua
    322 for i = 1, 10, 1 
     322for i = 1, 10, 1
    323323do
    324324?>
    … …  
    335335      </controller>
    336336    </SpaceShip>
    337 <?lua 
    338 end
    339 ?>
    340 
    341 <?lua
    342 for i = 1, 200, 1 
     337<?lua
     338end
     339?>
     340
     341<?lua
     342for i = 1, 200, 1
    343343do
    344344x = math.random() * 100  + (i-70) * 100
    … …  
    347347s = math.random() * 60 + 30
    348348?>
    349    
    350     <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>"> 
     349
     350    <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
    351351      <attached>
    352352        <Model position="0,0,0" scale=<?lua print(s) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    353353      </attached>
    354354    </MovableEntity>
    355 <?lua 
     355<?lua
    356356end
    357357?>
    … …  
    363363    return table.getn(elements)
    364364end
    365 for i = 1, 150, 1 
     365for i = 1, 150, 1
    366366do
    367367x = math.random() * 750 - 4500
    … …  
    370370e = math.floor(math.random()*elements.length()+1)
    371371?>
    372    
    373     <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>"> 
     372
     373    <MovableEntity position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.8 angularDamping=0.8 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 - 15) ?>">
    374374      <attached>
    375375        <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
    376376      </attached>
    377377    </MovableEntity>
    378 <?lua 
    379 end
    380 ?>
    381    
     378<?lua
     379end
     380?>
     381
    382382  </Scene>
    383383</Level>

  • code/trunk/data/levels/presentation_dm.oxw

    r5781 r6417  
    1818
    1919<?lua
    20 for i = 1, 10, 1 
     20for i = 1, 10, 1
    2121do ?>
    2222    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
    23 <?lua 
     23<?lua
    2424end
    2525?>
    … …  
    3535
    3636<?lua
    37 for i = 1, 100, 1 
     37for i = 1, 100, 1
    3838do
    3939j = math.random()
    4040?>
    41    
    42     <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     41
     42    <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    4343      <attached>
    4444        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4848      </collisionShapes>
    4949    </MovableEntity>
    50 <?lua 
     50<?lua
    5151end
    5252?>

  • code/trunk/data/levels/princessaeryn.oxw

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

  • code/trunk/data/levels/questsystem2.oxw

    • Property svn:eol-style set to native
    r5976 r6417  
    3737                    <QuestDescription title="The super Hint.3" description="Be proud of yourself.3" />
    3838                </QuestHint>
    39             </hints>   
     39            </hints>
    4040            <subquests>
    4141                <GlobalQuest id="e17f5245-f95b-44a8-b6cf-402274435ed4">
    … …  
    215215max = 20
    216216for i = 1, max, 1
    217 do 
     217do
    218218    x = math.sin(i/max*6)*40000
    219219    y = math.cos(i/max*6)*40000
    … …  
    221221    ?>
    222222<?lua
    223 for k = 1, 25, 1 
     223for k = 1, 25, 1
    224224do
    225225j = math.random()
    226226?>
    227    
    228     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     227
     228    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    229229      <attached>
    230230        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    234234      </collisionShapes> <?lua end ?>
    235235    </MovableEntity>
    236 <?lua 
     236<?lua
    237237end
    238238?>
    239239<?lua end ?>
    240240    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    241    
     241
    242242  </Scene>
    243243</Level>

  • code/trunk/data/levels/teambasematchlevel.oxw

    r5781 r6417  
    4141        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    4242<?lua
    43 for i = 1, 10, 1 
     43for i = 1, 10, 1
    4444do ?>
    4545        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    4646          <events><spawn><EventListener event="base 1" /></spawn></events>
    4747        </ParticleSpawner>
    48 <?lua 
     48<?lua
    4949end
    5050?>
    … …  
    7878        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    7979<?lua
    80 for i = 1, 10, 1 
     80for i = 1, 10, 1
    8181do ?>
    8282        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    8383          <events><spawn><EventListener event="base 2" /></spawn></events>
    8484        </ParticleSpawner>
    85 <?lua 
     85<?lua
    8686end
    8787?>
    … …  
    115115        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    116116<?lua
    117 for i = 1, 10, 1 
     117for i = 1, 10, 1
    118118do ?>
    119119        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    120120          <events><spawn><EventListener event="base 3" /></spawn></events>
    121121        </ParticleSpawner>
    122 <?lua 
     122<?lua
    123123end
    124124?>
    … …  
    151151        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    152152<?lua
    153 for i = 1, 10, 1 
     153for i = 1, 10, 1
    154154do ?>
    155155        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    156156          <events><spawn><EventListener event="base 4" /></spawn></events>
    157157        </ParticleSpawner>
    158 <?lua 
     158<?lua
    159159end
    160160?>
    … …  
    188188        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
    189189<?lua
    190 for i = 1, 10, 1 
     190for i = 1, 10, 1
    191191do ?>
    192192        <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
    193193          <events><spawn><EventListener event="base 5" /></spawn></events>
    194194        </ParticleSpawner>
    195 <?lua 
     195<?lua
    196196end
    197197?>

  • code/trunk/data/levels/templates/spaceship_assff.oxt

    r5781 r6417  
    6464   speedupdown    =  50
    6565
     66   defEngineSndNormal = "sounds/Engine_low.ogg"
     67   defEngineSndBoost = "sounds/Engine_high.ogg"
     68
    6669   accelerationfront     = 500
    6770   accelerationbrake     = 500
    … …  
    7073   accelerationupdown    =  125
    7174  >
    72     <active>
     75    <EffectContainer condition="idle">
     76      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" loop=1 active=false/>
     77    </EffectContainer>
     78    <EffectContainer condition="not idle">
    7379      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    7480<!--
    … …  
    7682      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
    7783-->
    78     </active>
    79     <forward>
     84    </EffectContainer>
     85    <EffectContainer condition="normal or brake">
     86
     87    </EffectContainer>
     88    <EffectContainer condition="normal or boost">
    8089      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    8190      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    82     </forward>
    83     <boost>
     91    </EffectContainer>
     92    <EffectContainer condition="boost">
    8493      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    8594      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    86     </boost>
    87     <brake>
     95    </EffectContainer>
     96    <EffectContainer condition="brake">
    8897      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    8998      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
    9099      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    91100      <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
    92     </brake>
     101    </EffectContainer>
    93102  </MultiStateEngine>
    94103</Template>

  • code/trunk/data/levels/templates/spaceship_ghost.oxt

    • Property svn:eol-style set to native
    r5989 r6417  
    1212   initialhealth     = 100
    1313
    14    primaryThrust     = 100;
     14   primaryThrust     = 600;
    1515   auxilaryThrust    = 30;
    1616   rotationThrust    = 25;
    … …  
    3333      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
    3434    </collisionShapes>
    35 
     35<?lua
     36  include("includes/weaponsettings_ghost.oxi")
     37?>
    3638  </SpaceShip>
    3739</Template>
    … …  
    4446      <CameraPosition position="0,50,200" drag=true mouselook=true />
    4547    </camerapositions>
    46 
    47 <?lua
    48   include("includes/weaponsettings_ghost.oxi")
    49 ?>
    50 
    5148  </SpaceShip>
    5249</Template>
    … …  
    5653   boostfactor    = 2
    5754
    58    speedfront     = 150
     55   speedfront     = 600
    5956   speedback      =  50
    6057   speedleftright =  50
    6158   speedupdown    =  50
    6259
    63    accelerationfront     = 300
     60   accelerationfront     = 700
    6461   accelerationbrake     = 300
    6562   accelerationback      =  100
    … …  
    6764   accelerationupdown    =  100
    6865  >
    69 
    70 
    71     <forward>
    72       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.06, 3.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    73       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.06, 3.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    74       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.06, 5.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    75       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.06, 5.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    76       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.86, 4.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    77       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.86, 4.66, 9.6" colour="1, 1, 1, 0.4" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
    78     </forward>
    79     <boost>
    80       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.06, 5.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    81       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.06, 5.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    82       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.06, 3.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    83       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.06, 3.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    84       <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.86, 4.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    85       <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.86, 4.66, 11.6" colour="0.5, 0.85, 0.5, 0.1" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
    86     </boost>
    87   </MultiStateEngine>
     66    <EffectContainer condition="normal or boost">
     67      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     68      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
     69    </EffectContainer>
     70    <EffectContainer condition="boost">
     71      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
     72      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
     73    </EffectContainer>
     74    <EffectContainer condition="not idle">
     75      <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 />
     77    </EffectContainer>
     78    <EffectContainer condition="brake">
     79      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     80      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
     81    </EffectContainer>
     82</MultiStateEngine>
    8883</Template>
    8984

  • code/trunk/data/levels/test_ghost.oxw

    • Property svn:eol-style set to native
    r5989 r6417  
    2424max = 20
    2525for i = 1, max, 1
    26 do 
     26do
    2727    x = math.sin(i/max*6)*40000
    2828    y = math.cos(i/max*6)*40000
    … …  
    3030    ?>
    3131<?lua
    32 for k = 1, 25, 1 
     32for k = 1, 25, 1
    3333do
    3434j = math.random()
    3535?>
    36    
    37     <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>"> 
     36
     37    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
    3838      <attached>
    3939        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
    … …  
    4343      </collisionShapes> <?lua end ?>
    4444    </MovableEntity>
    45 <?lua 
     45<?lua
    4646end
    4747?>
    4848<?lua end ?>
    4949    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    50    
     50
    5151  </Scene>
    5252</Level>
Note: See TracChangeset for help on using the changeset viewer.