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:
9 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • 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?>
Note: See TracChangeset for help on using the changeset viewer.