[Orxonox-commit 3969] r8643 - in code/branches/presentation/data: gui/layouts gui/scripts levels levels/includes levels/templates particle

landauf at orxonox.net landauf at orxonox.net
Sat May 28 18:45:14 CEST 2011


Author: landauf
Date: 2011-05-28 18:45:14 +0200 (Sat, 28 May 2011)
New Revision: 8643

Modified:
   code/branches/presentation/data/gui/layouts/DockingDialog.layout
   code/branches/presentation/data/gui/scripts/DockingDialog.lua
   code/branches/presentation/data/levels/docking.oxw
   code/branches/presentation/data/levels/earth.oxw
   code/branches/presentation/data/levels/includes/notifications.oxi
   code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi
   code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi
   code/branches/presentation/data/levels/myTestLevel.oxw
   code/branches/presentation/data/levels/portals.oxw
   code/branches/presentation/data/levels/presentationFS11.oxw
   code/branches/presentation/data/levels/quests.oxw
   code/branches/presentation/data/levels/shieldTest.oxw
   code/branches/presentation/data/levels/spaceRace.oxw
   code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
   code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt
   code/branches/presentation/data/levels/tetris.oxw
   code/branches/presentation/data/particle/RingExp.particle
   code/branches/presentation/data/particle/RingExp2.particle
   code/branches/presentation/data/particle/RingExp3.particle
   code/branches/presentation/data/particle/Shield.particle
   code/branches/presentation/data/particle/weaponflare.particle
   code/branches/presentation/data/particle/weaponshoot.particle
Log:
set svn:eol-style to native, removed svn:executable property. no code changes.


Property changes on: code/branches/presentation/data/gui/layouts/DockingDialog.layout
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/gui/scripts/DockingDialog.lua
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/docking.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/earth.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/includes/notifications.oxi
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/includes/weaponSettingsAssff2.oxi
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/includes/weaponSettingsImmTest.oxi
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/myTestLevel.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/portals.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/presentationFS11.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/quests.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/shieldTest.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/levels/spaceRace.oxw
===================================================================
--- code/branches/presentation/data/levels/spaceRace.oxw	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/levels/spaceRace.oxw	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,468 +1,468 @@
-<LevelInfo
- name = "Space Race"
- description = "Test level for the gametype Space Race."
- tags = "test"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level
- name         = "Space Race"
- description  = "Test level for the gametype Space Race."
- gametype     = SpaceRace
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyBoxMoreNebula"
-  >
-
-    <?lua math.randomseed(98) ?>
-
-    <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"/>
-
-    <SimpleNotification message="Reach the last check point within 150 seconds!!" />
-
-    <!-- ------------------SpawnPoint----------------- -->
-    <SpawnPoint position="0,-2100,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="true" >
-      <events>
-        <activity>
-          <EventTrigger invert="true">
-            <events>
-                <trigger>
-                    <EventListener event="checkpoint2" />
-                </trigger>
-            </events>
-          </EventTrigger>
-        </activity>
-      </events>
-    </SpawnPoint>
-    
-    <!-- ------------------CheckPoints----------------- -->
-    <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <Trigger mode="xor" invert="true" >
-                        <EventTrigger>
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint2" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                        <EventTrigger invert="true">
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint3" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                    </Trigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <Trigger mode="xor" invert="true" >
-                        <EventTrigger>
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint3" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                        <EventTrigger invert="true">
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint4" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                    </Trigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <DistanceTrigger name="trigger3" position="0,0,0" distance=40 stayActive="true" />
-            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <Trigger mode="xor" invert="true" >
-                        <EventTrigger>
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint4" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                        <EventTrigger invert="true">
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint5" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                    </Trigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
-        <attached>
-        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        <DistanceTrigger name="trigger4" position="0,0,0" distance=40 stayActive="true" />
-        <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-            <events>
-            <activity>
-                <Trigger mode="xor" invert="true" >
-                    <EventTrigger>
-                        <events>
-                            <trigger>
-                                <EventListener event="checkpoint5" />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                    <EventTrigger invert="true">
-                        <events>
-                            <trigger>
-                                <EventListener event="checkpoint6" />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                </Trigger>
-            </activity>
-            </events>
-        </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <DistanceTrigger name="trigger5" position="0,0,0" distance=40 stayActive="true" />
-            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <Trigger mode="xor" invert="true" >
-                        <EventTrigger>
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint6" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                        <EventTrigger invert="true">
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint7" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                    </Trigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <DistanceTrigger name="trigger6" position="0,0,0" distance=40 stayActive="true" />
-            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <Trigger mode="xor" invert="true" >
-                        <EventTrigger>
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint7" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                        <EventTrigger invert="true">
-                            <events>
-                                <trigger>
-                                    <EventListener event="checkpoint8" />
-                                </trigger>
-                            </events>
-                        </EventTrigger>
-                    </Trigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
-        <attached>
-        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        <DistanceTrigger name="trigger7" position="0,0,0" distance=40 stayActive="true" />
-        <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-            <events>
-            <activity>
-                <Trigger mode="xor" invert="true" >
-                    <EventTrigger>
-                        <events>
-                            <trigger>
-                                <EventListener event="checkpoint8" />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                    <EventTrigger invert="true">
-                        <events>
-                            <trigger>
-                                <EventListener event="checkpoint9" />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                </Trigger>
-            </activity>
-            </events>
-        </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-            <DistanceTrigger name="trigger8" position="0,0,0" distance=40 stayActive="true" />
-            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-                <events>
-                <activity>
-                    <EventTrigger>
-                        <events>
-                            <trigger>
-                                <EventListener event="checkpoint9" />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                </activity>
-                </events>
-            </SpawnPoint>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
-        <attached>
-        <   Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
-            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
-            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <!-- ------------------Planet----------------- -->
-    <Planet position="0,0,0" scale=300 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-    <StaticEntity position="0,0,0" collisionType=static>
-        <collisionShapes>
-            <SphereCollisionShape radius="399" />
-        </collisionShapes>
-    </StaticEntity>
-
-    <!-- ---------------asteroid ellypse----------------- -->
-    <?lua
-    max = 20
-    for i = 0, max, 1
-    do
-    y = math.sin(i/max*6)*2000
-    z = math.cos(i/max*6)*2500
-    x = 0
-    ?>
-    <?lua
-    for k = 1, 15, 1
-    do
-    j = math.random()
-    ?>
-
-    <MovableEntity
-      position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 500) ?>,<?lua print(z + math.random() * 1000) ?>"
-      collisionType = "dynamic"
-      linearDamping = "0.5"
-      angularDamping = "0.01"
-      collisiondamage = "0.01"
-      enablecollisiondamage = "true"
-      scale="<?lua print(j * 5) ?>" >
-      <attached>
-        <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
-      <?lua if k == 5 then ?><attached><!-- ---------asteroid fog----- -->
-            <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
-          </attached> <?lua end ?>
-        </Model>
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
-      </collisionShapes>
-    </MovableEntity>
-    <?lua
-    end
-    ?>
-    <?lua end ?>
-
-    <!-- ---------------ForceFields----------------- -->
-    <ForceField position="0,-700,2700" direction="0,1,0" diameter=500 velocity=2000 length=600 />
-        <MovableEntity position="0,-400,2700">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
-                <?lua for i=0,15,1 do ?>
-                    <Billboard position="-200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                    <Billboard position="200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                <?lua end ?>
-                </attached>
-        </MovableEntity>
-
-     <ForceField position="0,2500,2000" direction="0,0,-1" diameter=250 velocity=2000 length=600 />
-        <MovableEntity position="0,2500,2000">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
-                <?lua for i=0,15,1 do ?>
-                    <Billboard position="-100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                    <Billboard position="100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                <?lua end ?>
-                </attached>
-        </MovableEntity>
-
-    <ForceField position="0,1300,-800" direction="0,-1,-1" diameter=250 velocity=2000 length=800 />
-        <MovableEntity position="0,1300,-800">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
-                <?lua for i=0,20,1 do ?>
-                    <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                    <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                <?lua end ?>
-                </attached>
-        </MovableEntity>
-
-    <ForceField position="0,-1400,-700" direction="0,-1,1" diameter=250 velocity=2000 length=600 />
-        <MovableEntity position="0,-1400,-700">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
-                <?lua for i=0,15,1 do ?>
-                    <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                    <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                <?lua end ?>
-                </attached>
-        </MovableEntity>
-
-    <!-- ---------------SpaceShips----------------- -->
-    <SpaceShip position="0,2000,2000" lookat="0,0,0" team=1 >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-         <WaypointPatrolController alertnessradius=1500 team=0 >
-            <waypoints>
-                <Model scale=0 position="0,2000,2000" />
-            </waypoints>
-         </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="0,2000,-2000" lookat="0,0,0" team=1 >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1500 team=0 >
-            <waypoints>
-                <Model scale=0 position="0,2000,-2000" />
-            </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-  </Scene>
-</Level>
+<LevelInfo
+ name = "Space Race"
+ description = "Test level for the gametype Space Race."
+ tags = "test"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+?>
+
+<Level
+ name         = "Space Race"
+ description  = "Test level for the gametype Space Race."
+ gametype     = SpaceRace
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+  <?lua include("includes/notifications.oxi") ?>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/skyBoxMoreNebula"
+  >
+
+    <?lua math.randomseed(98) ?>
+
+    <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"/>
+
+    <SimpleNotification message="Reach the last check point within 150 seconds!!" />
+
+    <!-- ------------------SpawnPoint----------------- -->
+    <SpawnPoint position="0,-2100,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="true" >
+      <events>
+        <activity>
+          <EventTrigger invert="true">
+            <events>
+                <trigger>
+                    <EventListener event="checkpoint2" />
+                </trigger>
+            </events>
+          </EventTrigger>
+        </activity>
+      </events>
+    </SpawnPoint>
+    
+    <!-- ------------------CheckPoints----------------- -->
+    <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint2" position="0,-900,2300" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <Trigger mode="xor" invert="true" >
+                        <EventTrigger>
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint2" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                        <EventTrigger invert="true">
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint3" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                    </Trigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint3" position="0,700,2700" stayActive="true" direction="0,0,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <SpawnPoint position="0,0,0" lookat="0,1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <Trigger mode="xor" invert="true" >
+                        <EventTrigger>
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint3" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                        <EventTrigger invert="true">
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint4" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                    </Trigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint4" position="0,2100,2300" stayActive="true" direction="0,1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <DistanceTrigger name="trigger3" position="0,0,0" distance=40 stayActive="true" />
+            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <Trigger mode="xor" invert="true" >
+                        <EventTrigger>
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint4" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                        <EventTrigger invert="true">
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint5" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                    </Trigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint5" position="0,2200,500" stayActive="true" direction="0,1,0" collisionType="static" scale="1" distance="40" checkpointindex="4" islast="false">
+        <attached>
+        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+        <DistanceTrigger name="trigger4" position="0,0,0" distance=40 stayActive="true" />
+        <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+            <events>
+            <activity>
+                <Trigger mode="xor" invert="true" >
+                    <EventTrigger>
+                        <events>
+                            <trigger>
+                                <EventListener event="checkpoint5" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                    <EventTrigger invert="true">
+                        <events>
+                            <trigger>
+                                <EventListener event="checkpoint6" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </Trigger>
+            </activity>
+            </events>
+        </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint6" position="0,1500,-800" stayActive="true" direction="0,1,-1" collisionType="static" scale="1" distance="40" checkpointindex="5" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <DistanceTrigger name="trigger5" position="0,0,0" distance=40 stayActive="true" />
+            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <Trigger mode="xor" invert="true" >
+                        <EventTrigger>
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint6" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                        <EventTrigger invert="true">
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint7" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                    </Trigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint7" position="0,200,-1900" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="6" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <DistanceTrigger name="trigger6" position="0,0,0" distance=40 stayActive="true" />
+            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <Trigger mode="xor" invert="true" >
+                        <EventTrigger>
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint7" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                        <EventTrigger invert="true">
+                            <events>
+                                <trigger>
+                                    <EventListener event="checkpoint8" />
+                                </trigger>
+                            </events>
+                        </EventTrigger>
+                    </Trigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint8" position="0,-700,-1400" stayActive="true" direction="0,-1,-1" collisionType="static" scale="1" distance="40" checkpointindex="7" islast="false">
+        <attached>
+        <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+        <DistanceTrigger name="trigger7" position="0,0,0" distance=40 stayActive="true" />
+        <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+            <events>
+            <activity>
+                <Trigger mode="xor" invert="true" >
+                    <EventTrigger>
+                        <events>
+                            <trigger>
+                                <EventListener event="checkpoint8" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                    <EventTrigger invert="true">
+                        <events>
+                            <trigger>
+                                <EventListener event="checkpoint9" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </Trigger>
+            </activity>
+            </events>
+        </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint9" position="0,-1300,-800" stayActive="true" collisionType="static" scale="1" distance="40" checkpointindex="8" islast="false">
+        <attached>
+            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+            <DistanceTrigger name="trigger8" position="0,0,0" distance=40 stayActive="true" />
+            <SpawnPoint position="0,0,0" lookat="0,-1000,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
+                <events>
+                <activity>
+                    <EventTrigger>
+                        <events>
+                            <trigger>
+                                <EventListener event="checkpoint9" />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </activity>
+                </events>
+            </SpawnPoint>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <RaceCheckPoint name="checkpoint10" position="0,-2100,0" collisionType="static" scale="1" distance="40" checkpointindex="9" islast="true" timelimit="150">
+        <attached>
+        <   Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,55"      halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="0,0,-55"     halfExtents="55, 10, 10" />
+            <BoxCollisionShape position="55,0,0"      halfExtents="10, 10, 55" />
+            <BoxCollisionShape position="-55,0,0"     halfExtents="10, 10, 55" />
+        </collisionShapes>
+    </RaceCheckPoint>
+
+    <!-- ------------------Planet----------------- -->
+    <Planet position="0,0,0" scale=300 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <StaticEntity position="0,0,0" collisionType=static>
+        <collisionShapes>
+            <SphereCollisionShape radius="399" />
+        </collisionShapes>
+    </StaticEntity>
+
+    <!-- ---------------asteroid ellypse----------------- -->
+    <?lua
+    max = 20
+    for i = 0, max, 1
+    do
+    y = math.sin(i/max*6)*2000
+    z = math.cos(i/max*6)*2500
+    x = 0
+    ?>
+    <?lua
+    for k = 1, 15, 1
+    do
+    j = math.random()
+    ?>
+
+    <MovableEntity
+      position = "<?lua print(x + math.random() * 500) ?>,<?lua print(y + math.random() * 500) ?>,<?lua print(z + math.random() * 1000) ?>"
+      collisionType = "dynamic"
+      linearDamping = "0.5"
+      angularDamping = "0.01"
+      collisiondamage = "0.01"
+      enablecollisiondamage = "true"
+      scale="<?lua print(j * 5) ?>" >
+      <attached>
+        <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
+      <?lua if k == 5 then ?><attached><!-- ---------asteroid fog----- -->
+            <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
+          </attached> <?lua end ?>
+        </Model>
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
+      </collisionShapes>
+    </MovableEntity>
+    <?lua
+    end
+    ?>
+    <?lua end ?>
+
+    <!-- ---------------ForceFields----------------- -->
+    <ForceField position="0,-700,2700" direction="0,1,0" diameter=500 velocity=2000 length=600 />
+        <MovableEntity position="0,-400,2700">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
+                <?lua for i=0,15,1 do ?>
+                    <Billboard position="-200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                    <Billboard position="200,<?lua print(i*40) ?>,0" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                <?lua end ?>
+                </attached>
+        </MovableEntity>
+
+     <ForceField position="0,2500,2000" direction="0,0,-1" diameter=250 velocity=2000 length=600 />
+        <MovableEntity position="0,2500,2000">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
+                <?lua for i=0,15,1 do ?>
+                    <Billboard position="-100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                    <Billboard position="100,0,-<?lua print(i*40) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                <?lua end ?>
+                </attached>
+        </MovableEntity>
+
+    <ForceField position="0,1300,-800" direction="0,-1,-1" diameter=250 velocity=2000 length=800 />
+        <MovableEntity position="0,1300,-800">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
+                <?lua for i=0,20,1 do ?>
+                    <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                    <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(-i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                <?lua end ?>
+                </attached>
+        </MovableEntity>
+
+    <ForceField position="0,-1400,-700" direction="0,-1,1" diameter=250 velocity=2000 length=600 />
+        <MovableEntity position="0,-1400,-700">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
+                <?lua for i=0,15,1 do ?>
+                    <Billboard position="-100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                    <Billboard position="100,<?lua print(-i*40*0.7071) ?>,<?lua print(i*40*0.7071) ?>" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                <?lua end ?>
+                </attached>
+        </MovableEntity>
+
+    <!-- ---------------SpaceShips----------------- -->
+    <SpaceShip position="0,2000,2000" lookat="0,0,0" team=1 >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+         <WaypointPatrolController alertnessradius=1500 team=0 >
+            <waypoints>
+                <Model scale=0 position="0,2000,2000" />
+            </waypoints>
+         </WaypointPatrolController>
+      </controller>
+    </SpaceShip>
+
+    <SpaceShip position="0,2000,-2000" lookat="0,0,0" team=1 >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+        <WaypointPatrolController alertnessradius=1500 team=0 >
+            <waypoints>
+                <Model scale=0 position="0,2000,-2000" />
+            </waypoints>
+        </WaypointPatrolController>
+      </controller>
+    </SpaceShip>
+
+  </Scene>
+</Level>


Property changes on: code/branches/presentation/data/levels/spaceRace.oxw
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/templates/spaceshipImmTest.oxt
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/levels/tetris.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/particle/RingExp.particle
===================================================================
--- code/branches/presentation/data/particle/RingExp.particle	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/particle/RingExp.particle	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,135 +1,135 @@
-
-particle_system Orxonox/RingExp
-{
-	quota	500
-	material	PE/lensflare
-	particle_width	65
-	particle_height	40
-	cull_each	false
-	renderer	billboard
-	sorted	false
-	local_space	false
-	iteration_interval	0
-	nonvisible_update_timeout	0
-	billboard_type	oriented_self
-	billboard_origin	center
-	billboard_rotation_type	vertex
-	common_up_vector	0 1 0
-	point_rendering	false
-	accurate_facing	false
-
-	emitter Point
-	{
-		angle	55
-		colour	0.9 0.9 1 1
-		colour_range_start	0.9 0.9 1 1
-		colour_range_end	0.9 0.9 1 1
-		direction	-1 0 0
-		emission_rate	1250
-		position	0 0 0
-		velocity	65
-		velocity_min	65
-		velocity_max	65
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.1
-		duration_min	0.1
-		duration_max	0.1
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	emitter Point
-	{
-		angle	55
-		colour	0.9 0.9 1 1
-		colour_range_start	0.9 0.9 1 1
-		colour_range_end	0.9 0.9 1 1
-		direction	1 0 0
-		emission_rate	1250
-		position	0 0 0
-		velocity	65
-		velocity_min	65
-		velocity_max	65
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.1
-		duration_min	0.1
-		duration_max	0.1
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	emitter Point
-	{
-		angle	55
-		colour	0.9 0.9 1 1
-		colour_range_start	0.9 0.9 1 1
-		colour_range_end	0.9 0.9 1 1
-		direction	0 0 -1
-		emission_rate	1250
-		position	0 0 0
-		velocity	65
-		velocity_min	65
-		velocity_max	65
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.1
-		duration_min	0.1
-		duration_max	0.1
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	emitter Point
-	{
-		angle	55
-		colour	0.9 0.9 1 1
-		colour_range_start	0.9 0.9 1 1
-		colour_range_end	0.9 0.9 1 1
-		direction	0 0 1
-		emission_rate	1250
-		position	0 0 0
-		velocity	65
-		velocity_min	65
-		velocity_max	65
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.1
-		duration_min	0.1
-		duration_max	0.1
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	affector DeflectorPlane
-	{
-		plane_point	0 -2 0
-		plane_normal	0 1 0
-		bounce  1
-	}
-
-	affector DeflectorPlane
-	{
-		plane_point	0 2 0
-		plane_normal	0 -1 0
-		bounce	1
-	}
-
-	affector ColourFader
-	{
-		red	-0.3
-		green	-0.3
-		blue	-0.3
-		alpha	-0.3
-	}
-
-}
+
+particle_system Orxonox/RingExp
+{
+	quota	500
+	material	PE/lensflare
+	particle_width	65
+	particle_height	40
+	cull_each	false
+	renderer	billboard
+	sorted	false
+	local_space	false
+	iteration_interval	0
+	nonvisible_update_timeout	0
+	billboard_type	oriented_self
+	billboard_origin	center
+	billboard_rotation_type	vertex
+	common_up_vector	0 1 0
+	point_rendering	false
+	accurate_facing	false
+
+	emitter Point
+	{
+		angle	55
+		colour	0.9 0.9 1 1
+		colour_range_start	0.9 0.9 1 1
+		colour_range_end	0.9 0.9 1 1
+		direction	-1 0 0
+		emission_rate	1250
+		position	0 0 0
+		velocity	65
+		velocity_min	65
+		velocity_max	65
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.1
+		duration_min	0.1
+		duration_max	0.1
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	emitter Point
+	{
+		angle	55
+		colour	0.9 0.9 1 1
+		colour_range_start	0.9 0.9 1 1
+		colour_range_end	0.9 0.9 1 1
+		direction	1 0 0
+		emission_rate	1250
+		position	0 0 0
+		velocity	65
+		velocity_min	65
+		velocity_max	65
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.1
+		duration_min	0.1
+		duration_max	0.1
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	emitter Point
+	{
+		angle	55
+		colour	0.9 0.9 1 1
+		colour_range_start	0.9 0.9 1 1
+		colour_range_end	0.9 0.9 1 1
+		direction	0 0 -1
+		emission_rate	1250
+		position	0 0 0
+		velocity	65
+		velocity_min	65
+		velocity_max	65
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.1
+		duration_min	0.1
+		duration_max	0.1
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	emitter Point
+	{
+		angle	55
+		colour	0.9 0.9 1 1
+		colour_range_start	0.9 0.9 1 1
+		colour_range_end	0.9 0.9 1 1
+		direction	0 0 1
+		emission_rate	1250
+		position	0 0 0
+		velocity	65
+		velocity_min	65
+		velocity_max	65
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.1
+		duration_min	0.1
+		duration_max	0.1
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	affector DeflectorPlane
+	{
+		plane_point	0 -2 0
+		plane_normal	0 1 0
+		bounce  1
+	}
+
+	affector DeflectorPlane
+	{
+		plane_point	0 2 0
+		plane_normal	0 -1 0
+		bounce	1
+	}
+
+	affector ColourFader
+	{
+		red	-0.3
+		green	-0.3
+		blue	-0.3
+		alpha	-0.3
+	}
+
+}


Property changes on: code/branches/presentation/data/particle/RingExp.particle
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/particle/RingExp2.particle
===================================================================
--- code/branches/presentation/data/particle/RingExp2.particle	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/particle/RingExp2.particle	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,58 +1,58 @@
-
-particle_system Orxonox/RingExp2
-{
-	quota	500
-	material	PE/ringflare
-	particle_width	35
-	particle_height	35
-	cull_each	false
-	renderer	billboard
-	sorted	false
-	local_space	false
-	iteration_interval	0
-	nonvisible_update_timeout	0
-	billboard_type	oriented_self
-	billboard_origin	center
-	billboard_rotation_type	vertex
-	common_up_vector	0 1 0
-	point_rendering	false
-	accurate_facing	false
-
-	emitter Point
-	{
-		angle	30
-		colour	1 1 1 1
-		colour_range_start	1 1 1 1
-		colour_range_end	1 0.7 0.7 1
-		direction	0 1 0
-		emission_rate	1000
-		position	0 0 0
-		velocity	50
-		velocity_min	50
-		velocity_max	100
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.5
-		duration_min	0.5
-		duration_max	0.5
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	affector ColourFader
-	{
-		red	-0.3
-		green	-0.3
-		blue	-0.3
-		alpha	-0.3
-	}
-
-	affector DirectionRandomiser
-	{
-		randomness	5
-		scope	1.0
-		keep_velocity	true
-	}
-}
+
+particle_system Orxonox/RingExp2
+{
+	quota	500
+	material	PE/ringflare
+	particle_width	35
+	particle_height	35
+	cull_each	false
+	renderer	billboard
+	sorted	false
+	local_space	false
+	iteration_interval	0
+	nonvisible_update_timeout	0
+	billboard_type	oriented_self
+	billboard_origin	center
+	billboard_rotation_type	vertex
+	common_up_vector	0 1 0
+	point_rendering	false
+	accurate_facing	false
+
+	emitter Point
+	{
+		angle	30
+		colour	1 1 1 1
+		colour_range_start	1 1 1 1
+		colour_range_end	1 0.7 0.7 1
+		direction	0 1 0
+		emission_rate	1000
+		position	0 0 0
+		velocity	50
+		velocity_min	50
+		velocity_max	100
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.5
+		duration_min	0.5
+		duration_max	0.5
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	affector ColourFader
+	{
+		red	-0.3
+		green	-0.3
+		blue	-0.3
+		alpha	-0.3
+	}
+
+	affector DirectionRandomiser
+	{
+		randomness	5
+		scope	1.0
+		keep_velocity	true
+	}
+}


Property changes on: code/branches/presentation/data/particle/RingExp2.particle
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/particle/RingExp3.particle
===================================================================
--- code/branches/presentation/data/particle/RingExp3.particle	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/particle/RingExp3.particle	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,58 +1,58 @@
-
-particle_system Orxonox/RingExp3
-{
-	quota	500
-	material	PE/ringflare
-	particle_width	35
-	particle_height	35
-	cull_each	false
-	renderer	billboard
-	sorted	false
-	local_space	false
-	iteration_interval	0
-	nonvisible_update_timeout	0
-	billboard_type	oriented_self
-	billboard_origin	center
-	billboard_rotation_type	vertex
-	common_up_vector	0 1 0
-	point_rendering	false
-	accurate_facing	false
-
-	emitter Point
-	{
-		angle	30
-		colour	1 1 1 1
-		colour_range_start	1 1 1 1
-		colour_range_end	1 0.7 0.7 1
-		direction	0 -1 0
-		emission_rate	1000
-		position	0 0 0
-		velocity	50
-		velocity_min	50
-		velocity_max	100
-		time_to_live	4
-		time_to_live_min	4
-		time_to_live_max	4
-		duration	0.5
-		duration_min	0.5
-		duration_max	0.5
-		repeat_delay	10
-		repeat_delay_min	10
-		repeat_delay_max	10
-	}
-
-	affector ColourFader
-	{
-		red	-0.3
-		green	-0.3
-		blue	-0.3
-		alpha	-0.3
-	}
-
-	affector DirectionRandomiser
-	{
-		randomness	5
-		scope	1.0
-		keep_velocity	true
-	}
-}
+
+particle_system Orxonox/RingExp3
+{
+	quota	500
+	material	PE/ringflare
+	particle_width	35
+	particle_height	35
+	cull_each	false
+	renderer	billboard
+	sorted	false
+	local_space	false
+	iteration_interval	0
+	nonvisible_update_timeout	0
+	billboard_type	oriented_self
+	billboard_origin	center
+	billboard_rotation_type	vertex
+	common_up_vector	0 1 0
+	point_rendering	false
+	accurate_facing	false
+
+	emitter Point
+	{
+		angle	30
+		colour	1 1 1 1
+		colour_range_start	1 1 1 1
+		colour_range_end	1 0.7 0.7 1
+		direction	0 -1 0
+		emission_rate	1000
+		position	0 0 0
+		velocity	50
+		velocity_min	50
+		velocity_max	100
+		time_to_live	4
+		time_to_live_min	4
+		time_to_live_max	4
+		duration	0.5
+		duration_min	0.5
+		duration_max	0.5
+		repeat_delay	10
+		repeat_delay_min	10
+		repeat_delay_max	10
+	}
+
+	affector ColourFader
+	{
+		red	-0.3
+		green	-0.3
+		blue	-0.3
+		alpha	-0.3
+	}
+
+	affector DirectionRandomiser
+	{
+		randomness	5
+		scope	1.0
+		keep_velocity	true
+	}
+}


Property changes on: code/branches/presentation/data/particle/RingExp3.particle
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/particle/Shield.particle
===================================================================
--- code/branches/presentation/data/particle/Shield.particle	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/particle/Shield.particle	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,49 +1,49 @@
-
-particle_system Orxonox/Shield
-{
-	quota	2000
-	material	PE/lensflare
-	particle_width	25
-	particle_height	25
-	cull_each	false
-	renderer	billboard
-	sorted	false
-	local_space	true
-	iteration_interval	0
-	nonvisible_update_timeout	0
-	billboard_type	point
-	billboard_origin	center
-	billboard_rotation_type	texcoord
-	common_up_vector	0 1 0
-	point_rendering	false
-	accurate_facing	false
-
-	emitter HollowEllipsoid
-	{
-		angle	0
-		colour	0 0.298701 1 0.1
-		colour_range_start	0 0.298701 1 0.1
-		colour_range_end	0 0.298701 1 0.1
-		direction	0 1 0
-		emission_rate	2000
-		position	0 0 0
-		velocity	0
-		velocity_min	0
-		velocity_max	0
-		time_to_live	0.1
-		time_to_live_min	0.1
-		time_to_live_max	0.3
-		duration	0.1
-		duration_min	0.1
-		duration_max	0.2
-		repeat_delay	1000000
-		repeat_delay_min	1000000
-		repeat_delay_max	1000000
-		width	100
-		height	100
-		depth	100
-		inner_width	0.999999
-		inner_height	0.999999
-		inner_depth	0.999999
-	}
-}
+
+particle_system Orxonox/Shield
+{
+	quota	2000
+	material	PE/lensflare
+	particle_width	25
+	particle_height	25
+	cull_each	false
+	renderer	billboard
+	sorted	false
+	local_space	true
+	iteration_interval	0
+	nonvisible_update_timeout	0
+	billboard_type	point
+	billboard_origin	center
+	billboard_rotation_type	texcoord
+	common_up_vector	0 1 0
+	point_rendering	false
+	accurate_facing	false
+
+	emitter HollowEllipsoid
+	{
+		angle	0
+		colour	0 0.298701 1 0.1
+		colour_range_start	0 0.298701 1 0.1
+		colour_range_end	0 0.298701 1 0.1
+		direction	0 1 0
+		emission_rate	2000
+		position	0 0 0
+		velocity	0
+		velocity_min	0
+		velocity_max	0
+		time_to_live	0.1
+		time_to_live_min	0.1
+		time_to_live_max	0.3
+		duration	0.1
+		duration_min	0.1
+		duration_max	0.2
+		repeat_delay	1000000
+		repeat_delay_min	1000000
+		repeat_delay_max	1000000
+		width	100
+		height	100
+		depth	100
+		inner_width	0.999999
+		inner_height	0.999999
+		inner_depth	0.999999
+	}
+}


Property changes on: code/branches/presentation/data/particle/Shield.particle
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: code/branches/presentation/data/particle/weaponflare.particle
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native

Modified: code/branches/presentation/data/particle/weaponshoot.particle
===================================================================
--- code/branches/presentation/data/particle/weaponshoot.particle	2011-05-28 16:35:18 UTC (rev 8642)
+++ code/branches/presentation/data/particle/weaponshoot.particle	2011-05-28 16:45:14 UTC (rev 8643)
@@ -1,57 +1,57 @@
-
-particle_system Orxonox/weaponshoot
-{
-	quota	2000
-	material	PE/lensflare
-	particle_width	3
-	particle_height	3
-	cull_each	false
-	renderer	billboard
-	billboard_type	point
-
-	emitter Point
-	{
-		angle	0.5
-		colour	0 0 0.8 1
-		colour_range_start	0 0 0.8 1
-		colour_range_end	0.1 0.1 0.9 1
-		direction	0 0 1
-		emission_rate	6
-		position	0 0 0
-		velocity	35
-		velocity_min	35
-		velocity_max	35
-		time_to_live	5
-		time_to_live_min	5
-		time_to_live_max	5
-		duration	1
-		duration_min	1
-		duration_max	1
-		repeat_delay	4
-		repeat_delay_min	4
-		repeat_delay_max	4
-	}
-
-	emitter Point
-	{
-		angle	90
-		colour	0 0 0.8 1
-		colour_range_start	0 0 0.8 1
-		colour_range_end	0.1 0.1 1 1
-		direction	0 0 -1
-		emission_rate	1500
-		position	0 0 0
-		velocity	15
-		velocity_min	15
-		velocity_max	15
-		time_to_live	0.005
-		time_to_live_min	0.005
-		time_to_live_max	0.0075
-		duration	0.75
-		duration_min	0.75
-		duration_max	0.75
-		repeat_delay	4.25
-		repeat_delay_min	4.25
-		repeat_delay_max	4.25
-	}
+
+particle_system Orxonox/weaponshoot
+{
+	quota	2000
+	material	PE/lensflare
+	particle_width	3
+	particle_height	3
+	cull_each	false
+	renderer	billboard
+	billboard_type	point
+
+	emitter Point
+	{
+		angle	0.5
+		colour	0 0 0.8 1
+		colour_range_start	0 0 0.8 1
+		colour_range_end	0.1 0.1 0.9 1
+		direction	0 0 1
+		emission_rate	6
+		position	0 0 0
+		velocity	35
+		velocity_min	35
+		velocity_max	35
+		time_to_live	5
+		time_to_live_min	5
+		time_to_live_max	5
+		duration	1
+		duration_min	1
+		duration_max	1
+		repeat_delay	4
+		repeat_delay_min	4
+		repeat_delay_max	4
+	}
+
+	emitter Point
+	{
+		angle	90
+		colour	0 0 0.8 1
+		colour_range_start	0 0 0.8 1
+		colour_range_end	0.1 0.1 1 1
+		direction	0 0 -1
+		emission_rate	1500
+		position	0 0 0
+		velocity	15
+		velocity_min	15
+		velocity_max	15
+		time_to_live	0.005
+		time_to_live_min	0.005
+		time_to_live_max	0.0075
+		duration	0.75
+		duration_min	0.75
+		duration_max	0.75
+		repeat_delay	4.25
+		repeat_delay_min	4.25
+		repeat_delay_max	4.25
+	}
 }


Property changes on: code/branches/presentation/data/particle/weaponshoot.particle
___________________________________________________________________
Deleted: svn:executable
   - *
Added: svn:eol-style
   + native




More information about the Orxonox-commit mailing list