[Orxonox-commit 4688] r9359 - in code/branches/release2012: data/levels data/levels/includes data/levels/templates src/modules src/orxonox/controllers

jo at orxonox.net jo at orxonox.net
Sat Sep 1 17:04:18 CEST 2012


Author: jo
Date: 2012-09-01 17:04:18 +0200 (Sat, 01 Sep 2012)
New Revision: 9359

Removed:
   code/branches/release2012/data/levels/FPSTest.oxw
   code/branches/release2012/data/levels/Spacerace2.oxw
   code/branches/release2012/data/levels/SurfaceRacePresentation.oxw
   code/branches/release2012/data/levels/asteroidField.oxw
   code/branches/release2012/data/levels/docking.oxw
   code/branches/release2012/data/levels/earth.oxw
   code/branches/release2012/data/levels/emptyLevel.oxw
   code/branches/release2012/data/levels/events.oxw
   code/branches/release2012/data/levels/fightInOurBack.oxw
   code/branches/release2012/data/levels/gallery.oxw
   code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi
   code/branches/release2012/data/levels/myTestLevel.oxw
   code/branches/release2012/data/levels/notifications.oxw
   code/branches/release2012/data/levels/old/
   code/branches/release2012/data/levels/pickups.oxw
   code/branches/release2012/data/levels/pirateAttack.oxw
   code/branches/release2012/data/levels/planets.oxw
   code/branches/release2012/data/levels/portals.oxw
   code/branches/release2012/data/levels/presentation.oxw
   code/branches/release2012/data/levels/presentation09.oxw
   code/branches/release2012/data/levels/presentation09b.oxw
   code/branches/release2012/data/levels/presentationDM.oxw
   code/branches/release2012/data/levels/presentationFS10.oxw
   code/branches/release2012/data/levels/presentationFS102.oxw
   code/branches/release2012/data/levels/presentationFS10Ed.oxw
   code/branches/release2012/data/levels/presentationFS11.oxw
   code/branches/release2012/data/levels/presentationHS09.oxw
   code/branches/release2012/data/levels/presentationHS09b.oxw
   code/branches/release2012/data/levels/presentationHS11.oxw
   code/branches/release2012/data/levels/princessAeryn.oxw
   code/branches/release2012/data/levels/quests.oxw
   code/branches/release2012/data/levels/screenshot.oxw
   code/branches/release2012/data/levels/shieldTest.oxw
   code/branches/release2012/data/levels/sound.oxw
   code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt
   code/branches/release2012/data/levels/templates/tower.oxt
   code/branches/release2012/data/levels/testStars.oxw
   code/branches/release2012/data/levels/testSwallow.oxw
   code/branches/release2012/data/levels/towerDefense.oxw
   code/branches/release2012/data/levels/tutorial.oxw
   code/branches/release2012/data/levels/waypoints.oxw
   code/branches/release2012/src/modules/towerdefense/
   code/branches/release2012/src/orxonox/controllers/ScriptController.cc
   code/branches/release2012/src/orxonox/controllers/ScriptController.h
Modified:
   code/branches/release2012/src/modules/CMakeLists.txt
   code/branches/release2012/src/orxonox/controllers/CMakeLists.txt
Log:
I removed most levels, towerdefence and the script controller since these parts are not needed in a release version.

Deleted: code/branches/release2012/data/levels/FPSTest.oxw
===================================================================
--- code/branches/release2012/data/levels/FPSTest.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/FPSTest.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,70 +0,0 @@
-<LevelInfo
- name = "FPS testlevel"
- description = "Level to test First Person Shooter"
- tags = "test"
- screenshot = "fpstestlevel.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/FPS.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skyBoxBasic"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="10000,10000,1000" />
-      </collisionShapes>
-  </StaticEntity>
-
-<?lua
-for i = 1, 10, 1
-do ?>
-    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,100,<?lua print(math.random() * 1000 - 500) ?>" direction="-1, 0, 0" lookat="0,0,0" spawnclass=FpsPlayer pawndesign=fps />
-<?lua
-end
-?>
-
-
-<?lua
-for i = 1, 200, 1
-do
-j = math.random()
-?>
-  <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 * 100) ?> 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) ?>" >
-      <attached>
-        <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 100) ?>" />
-      </collisionShapes>
-  </MovableEntity>
-<?lua
-end
-?>
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/Spacerace2.oxw
===================================================================
--- code/branches/release2012/data/levels/Spacerace2.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/Spacerace2.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,207 +0,0 @@
-<LevelInfo
- name = "Spacerace 2"
- description = "New Spacerace with Multiple Paths."
- tags = "gametype"
- screenshot = "spacerace2.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-
-  include("templates/spaceshipAssff.oxt")
-
-?>
-
-<?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level
- name         = "Spacerace2"
- description  = "Just a few tests"
-gametype = SpaceRace
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-
-
-    <SpaceRaceManager>
-        <checkpoints>
-            <RaceCheckPoint name="checkpoint1" position="0,-2000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="0" islast="false" nextcheckpoints="1,2,-1">
-                <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,2100,2300" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="1" islast="false" nextcheckpoints="3,-1,-1">
-                <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="checkpoint3" position="0,700,2700" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
-                <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="checkpoint4" position="0,-400,300" direction="0,-1,1" collisionType="static" scale="1" distance="40" checkpointindex="3" islast="true">
-                <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>
-        </checkpoints>
-    </SpaceRaceManager>
-
-
-    <SpaceShip position="0,0,200" lookat="0,0,0">
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=0 team=10>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=0 position="0,-2000,1000" />
-            <Model mesh="cube.mesh" scale=0 position="0,2100,2300" />
-            <Model mesh="cube.mesh" scale=0 position="0,-400,300" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-
-    <!-- ------------------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 ellipse----------------- -->
-    <?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>
-
-
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/SurfaceRacePresentation.oxw
===================================================================
--- code/branches/release2012/data/levels/SurfaceRacePresentation.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/SurfaceRacePresentation.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,376 +0,0 @@
-<LevelInfo
- name = "Surface Race Presentation"
- description = "just awesome 2.0"
- screenshot = "surfaceRace.png"
- tags = "gametype, shipselection"
- startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser, spaceshiprace"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-  include("templates/spaceshipRace.oxt")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipGhost.oxt")
-  include("templates/spaceshipSpacecruiser.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-
-?>
-
-<Level
-gametype = SpaceRace
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "2.0, 2.0, 2.0"
-    skybox       = "Orxonox/skyBoxClouds"
-    gravity      = "0,-75,0"
-    negativeWorldRange = "-100000, -100000, -100000"
-    positiveWorldRange = " 100000,  100000,  100000"
-    hasPhysics   = true
-  >
-
-    <Template name=PortalDefault>
-        <PortalEndPoint>
-            <attached>
-                <Model mesh="Spacegate.mesh" scale="3"/>
-            </attached>
-        </PortalEndPoint>
-    </Template>
-
-    <PortalEndPoint position="6000,8050,2500" id="1" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
-    <PortalEndPoint position="6100,8050,-4500" id="2" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
-    <PortalLink fromID="1" toID="2" />
-    <PortalLink fromID="2" toID="1" />
-
-  <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"/>
-
-
-    <Model position="4200,8050,-1000" scale=10 mesh="debris-pile01.mesh" shadow=true />
-    <Model position="4200,8050,-1000" scale=10 mesh="debris-pile02.mesh" shadow=true />
-    <Model position="4200,8050,-1000" scale=10 mesh="debris-pile03.mesh" shadow=true />
-
-    <MovableEntity position="-700,8090,-300" velocity="80,0,0" rotationaxis="1,0,1" rotationrate=200>
-      <attached>
-        <Model position="0,0,-20" scale=10 mesh="cokebottle.mesh" />
-      </attached>
-    </MovableEntity>
-
-
-<SpaceRaceManager>
- <checkpoints>
-    <RaceCheckPoint name="checkpoint1" position="0,8050,-1000" direction="0,1,0" collisionType="static" scale="4" distance="150" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-    <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint2" position="1000,8050,-4000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="1" islast="false" nextcheckpoints="2,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-           <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint3" position="3000,8050,-4000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint4" position="4000,8050,-1000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="3" islast="false" nextcheckpoints="4,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint5" position="4000,8050,0" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="4" islast="false" nextcheckpoints="5,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint6" position="3000,8050,1000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint7" position="0,8050,2000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="6" islast="false" nextcheckpoints="7,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-      <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint8" position="-4000,8050,3000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="7" islast="false" nextcheckpoints="8,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint9" position="-4000,8050,5000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-         <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint10" position="-3000,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="9" islast="false" nextcheckpoints="10,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint11" position="0,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="120" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint12" position="6000,8050,6000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-      <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint13" position="5500,8050,3000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-
-    <RaceCheckPoint name="checkpoint14" position="6000,8050,-5000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="13" islast="true" >
-        <attached>
-            <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
-        </attached>
-       <collisionShapes>
-            <BoxCollisionShape position="0,0,220"     halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="0,0,-220"      halfExtents="220, 40, 40" />
-            <BoxCollisionShape position="220,0,0"      halfExtents="40, 40, 220" />
-            <BoxCollisionShape position="-220,0,0"       halfExtents="40, 40, 220" />
-        </collisionShapes>
-    </RaceCheckPoint>
-</checkpoints>
-</SpaceRaceManager>
-
- <SpawnPoint team=0 position="0,8050,0" lookat="0,8000,-8000" spawnclass=SpaceShip pawndesign=shipselection />
-
-
-    <!-- -----------------------Zylinder---------------------------- -->
-<StaticEntity position="2750,8050,6000" direction="1,0,0" roll="90"  scale="4" collisionType=static mass=100000 friction=0.01 >
-      <attached>
-    <Model position="0,0,0" mesh="cylinder.mesh" scale3D="100,100,400" />
-    <!--
-                <Model position="0,80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
-        <Model position="0,-80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
-        <Model position="80,0,600" mesh="testcube.mesh" scale3D="18,90,-600" />
-        <Model position="-80,0,600" mesh="testcube.mesh" scale3D="18,09,-600" />
-    -->
-
-      </attached>
-
-
-    <collisionShapes>
-
-
-        <BoxCollisionShape position="0,320,2400"            halfExtents="360,72,2400" />
-        <BoxCollisionShape position="0,-320,2400"      halfExtents="360,72,2400" />
-        <BoxCollisionShape position="320,0,2400"            halfExtents="72,360,2400" />
-        <BoxCollisionShape position="-320,0,2400"     halfExtents="72,360,2400" />
-
-
-
-        </collisionShapes>
-
-  </StaticEntity>
-
-<!-- ------------------Cube between gate 4 and 5----------------- -->
-<StaticEntity position="4465,8050,-500" direction="0,0,0"   scale="1" collisionType=static mass=100000 friction=0.01 >
-      <attached>
-    <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
-                <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
-        -->
-
-      </attached>
-
-
-    <collisionShapes>
-
-
-        <BoxCollisionShape position="0,0,0"            halfExtents="450,600,50" />
-
-        </collisionShapes>
-
-  </StaticEntity>
-
-<StaticEntity position="3535,8050,-500" direction="0,0,0"   scale="1" collisionType=static mass=100000 friction=0.01 >
-      <attached>
-    <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
-                <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
-        -->
-
-      </attached>
-
-
-    <collisionShapes>
-
-
-        <BoxCollisionShape position="0,0,0"            halfExtents="450,600,50" />
-
-        </collisionShapes>
-
-  </StaticEntity>
-
-
-
-
-    <!-- ------------------Boden----------------- -->
-  <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01>
-     <attached>
-        <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="8000,8000,8000" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,50,0" halfExtents="8000,8000,8000" />um j?:P"{
-
-      </collisionShapes>
-</StaticEntity>
-
-
-<!-- ---------------------PickUp---------------------- -->
-
-
-   <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
-   <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
-   <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60"  maxSpawnedItems="5" scale="8" />
-
-
-
-
- <!-- ---------------asteroid ellipse----------------- -->
-
- <?lua
-    max = 15
-    for i = 0, max, 1
-    do
-    x=-12000
-    y=10000
-    z=-12000
-
-    ?>
-    <?lua
-    for k = 1, 15, 1
-    do
-    j = math.random()
-    ?>
-
-    <MovableEntity
-      position = "<?lua print(x + math.random() * 20000) ?>,<?lua print(y + math.random() * 5000) ?>,<?lua print(z + math.random() * 20000) ?>"
-      collisionType = "dynamic"
-      linearDamping = "0.5"
-      angularDamping = "0.5"
-      collisiondamage = "100"
-      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 == 0 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 ?>
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/asteroidField.oxw
===================================================================
--- code/branches/release2012/data/levels/asteroidField.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/asteroidField.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,100 +0,0 @@
-<LevelInfo
- name = "asteroidFieldTest"
- description = "Test of the asteroidField generator."
-  screenshot = "asteroidFieldTest.png"
- tags = "test, showcase"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-    hasPhysics   = true
-  >
-
-    <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"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-
-
-
-    <!-- Belt that's far away  *** TURNED OFF FOR PERFORMANCE REASONS *** -->
-    <!-- Generate asteroid field and asteroid belt -->
-    <!--
-    <?lua
-        dofile("includes/asteroidField.lua")
-        asteroidBelt(0, 0, 0, -48, -34, 70, 100, 200, 219900, 210000, 900, 1)
-    ?>
-    -->
-
-
-    <!-- triple large belt around the planet  -->
-    <?lua
-        dofile("includes/asteroidField.lua")
-        asteroidBelt(15000, 0, 0, 30, 0, 30, 30, 50, 7190, 7800, 250, 1)
-    ?>
-    <?lua
-        dofile("includes/asteroidField.lua")
-        asteroidBelt(15000, 0, 0, 30, 0, 30, 30, 50, 10000, 11000, 300, 1)
-    ?>
-    <?lua
-        dofile("includes/asteroidField.lua")
-        asteroidBelt(15000, 0, 0, 30, 0, 30, 30, 50, 14000, 15000, 350, 1)
-    ?>
-
-
-
-    <!-- Planet close to spawn point -->
-    <Planet
-      position="15000,0,0"
-      scale="5000"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="10000000"
-      pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="1,0,0"
-      rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="5000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-
-
-
-
-
-
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/docking.oxw
===================================================================
--- code/branches/release2012/data/levels/docking.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/docking.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,208 +0,0 @@
-<LevelInfo
- name = "Transporter"
- description = "Level with a Transporter. Demonstrates the docking system."
- tags = "showcase"
- screenshot = "transporter.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link="lodtemplate_default" />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-
-    <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" />
-
-    <?lua for i = 1, 10, 1 do ?>
-      <SpawnPoint position="<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" lookat="0,0,0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-    <?lua end ?>
-
-
-
-      <SpaceShip
-   position               = "280, 150, 115"
-   orientation            = "0.5, 0.5, 0.5, 0.5"
-   hudtemplate            = "spaceshiphud"
-   camerapositiontemplate = "spaceshipassffcameras"
-   engine                 = "spaceshipassffengine"
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = "3"
-   explosionchunks        = "6"
-
-   health            = "100"
-   maxhealth         = "200"
-   initialhealth     = "100"
-
-   primaryThrust     = "100;"
-   auxilaryThrust    = "30;"
-   rotationThrust    = "25;"
-
-   collisionType     = "dynamic"
-   mass              = "100"
-   linearDamping     = "0.7"
-   angularDamping    = "0.9999999"
-  >
-    <attached>
-        <DistanceTriggerBeacon name="bcnSpaceShip" />
-        <DockingTarget name="spaceShip" />
-
-      <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="4" mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude="0.1" frequency="0.5" quadratic="1" />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude="0.1" frequency="0.5" phase="180" quadratic="1" />
-      <DistanceTriggerBeacon name="PlayerDistanceTrigger" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponSettingsAssff.oxi")
-?>
-  </SpaceShip>
-
-    
-
-
-    <Destroyer
-      position          = "100,150,100"
-      collisionType     = "dynamic"
-      mass              = "100000"
-      velocity          = "0,0,0"
-      angularDamping    = "0.9999999"
-      health            = "10000"
-      maxhealth         = "10000"
-      initialhealth     = "10000"
-    >
-
-      <attached>
-
-        <DistanceTriggerBeacon name="bcnDestroyer" />
-        <DockingTarget name="destroyer" />
-
-
-        <Dock orientation="0.5, 0.5, 0.5, 0.5">
-            <animations>
-                <MoveToDockingTarget target="destroyer" position="10,150,40" />
-            </animations>
-            <effects>
-                <DockToShip target="spaceShip" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="dockMe" />
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger position="0,0,-200" distance="30" target="Pawn" beaconMode="exclude" targetname="bcnDestroyer" name="dockMe" />
-                <Billboard position="0,0,-200" material="Examples/Flare" colour="1.0, 0, 0" />
-            </attached>
-        </Dock>
-
-
-        <TeamSpawnPoint team="1" position="150,0,7" direction="-1,0,0" roll="90" yaw="0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-        <TeamSpawnPoint team="1" position="0,0,7" lookat="-1,0,0" roll="90"  yaw="0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-        <TeamSpawnPoint team="1" position="-50,0,7" lookat="-1,0,0" roll="90" yaw="0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-        <TeamSpawnPoint team="1" position="100,0,7" lookat="-1,0,0" roll="90" yaw="0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-        <TeamSpawnPoint team="1" position="50,0,7" lookat="-1,0,0" roll="90" yaw="0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
-        <?lua for i = 1, 100, 1 do ?>
-          <TeamSpawnPoint
-            team="0"
-            position="<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>"
-            lookat="0,0,0"
-            spawnclass="SpaceShip"
-            pawndesign="spaceshipassff"
-          />
-        <?lua end ?>
-
-        <Model mesh="Carrier.mesh" scale="5" />
-        <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"
-        />
-        <Backlight
-                  scale="1"
-                  position=" 169, 75, -15"
-                  colour="1, 0.85, 0.5, 0.5"
-                  width="40"
-                  length="1000"
-                  lifetime="5"
-                  elements="15"
-                  trailmaterial="Trail/backlighttrail"
-                  material="Examples/Flare"
-                  />
-        <Backlight
-                  scale="1"
-                  position=" 169, -75, -15"
-                  colour="1, 0.85, 0.5, 0.5"
-                  width="40"
-                  length="1000"
-                  lifetime="5"
-                  elements="15"
-                  trailmaterial="Trail/backlighttrail"
-                  material="Examples/Flare"
-         />
-        <?lua for i=0,8,1 do ?>
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?> ,15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude="0.1"
-            frequency="0.5"
-            quadratic="1"
-          />
-
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?>,-15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude="0.1"
-            frequency="0.5"
-            quadratic="1"
-          />
-        <?lua end ?>
-
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-
-    </Destroyer>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/earth.oxw
===================================================================
--- code/branches/release2012/data/levels/earth.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/earth.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,114 +0,0 @@
-<LevelInfo
- name = "Earth Demonstration"
- description = "1:100 Scale Model of Earth with Gravity"
- tags = "showcase"
- screenshot = "earthdemonstration.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-  include("templates/spaceshipHXY.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link="lodtemplate_default" />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Template name=PortalDefault>
-      <PortalEndPoint>
-          <attached>
-              <Billboard material="Portals/Default" />
-          </attached>
-      </PortalEndPoint>
-  </Template>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyboxempty"
-  >
-    <WorldAmbientSound
-      source="Earth.ogg"
-      looping="true"
-      playOnLoad="true"
-    />
-
-    <Light
-      type="directional"
-      position="-500000,-500000,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"
-    />
-
-
-
-    <SpawnPoint
-      position="70000,0,0"
-      lookat="0,0,0"
-      spawnclass="SpaceShip"
-      pawndesign="spaceshipHXY"
-    />
-    <PortalEndPoint position="70500,100,0" id="1" distance="40" target="MobileEntity" design="PortalDefault"/>
-
-    <!-- This is a model of Earth: mass=EarthMass/1000 and radius=EarthRadius[km]*10 -->
-    <Planet
-      position="0,0,0"
-      scale="63000"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="5.9e21"
-      pitch="0"
-      mesh="planets/earth.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="0,1,0"
-      rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="63000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-
-    <!-- This is a model of our Moon: mass=MoonMass/1000 and radius=MoonRadius[km]*10 and position=DistanceFromEarth[km]*10 -->
-    <Planet
-      position="3625700,0,0"
-      scale="17370"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="7.36e19"
-      pitch="0"
-      mesh="planets/moon.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="0,1,0"
-      rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="17370" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-    <PortalEndPoint position="3603330,100,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
-
-    <!-- Create portals from Earth to the Moon -->
-    <PortalLink fromID="1" toID="2" />
-    <PortalLink fromID="2" toID="1" />
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/release2012/data/levels/emptyLevel.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/emptyLevel.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,35 +0,0 @@
-<LevelInfo
- name = "Empty level"
- description = "A level with absolutely nothing in it."
- tags = "test"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
-    
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/events.oxw
===================================================================
--- code/branches/release2012/data/levels/events.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/events.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,233 +0,0 @@
-<LevelInfo
-  name = "Events showcase"
-  description = "Level to test and showcase events."
-  tags = "test, showcase"
-  screenshot = "eventsshowcase.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-    <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" />
-
-    <SpawnPoint position="0,-100,0" lookat="0,0,0" roll=180 spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <Billboard position=" 300,100,  0" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
-    <Billboard position=" 200,100,  0" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
-    <Billboard position=" 200,100,100" material="Examples/Flare" colour="1.0, 0.5, 0.0" />
-    <Billboard position=" 100,100,  0" material="Examples/Flare" colour="1.0, 1.0, 0.0" />
-    <Billboard position="   0,100,  0" material="Examples/Flare" colour="0.0, 1.0, 0.0" />
-    <Billboard position="-100,100,  0" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
-    <Billboard position="-100,100,100" material="Examples/Flare" colour="0.0, 1.0, 1.0" />
-    <Billboard position="-200,100,  0" material="Examples/Flare" colour="0.0, 0.0, 1.0" />
-    <Billboard position="-300,100,  0" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
-
-
-
-    <!--
-      Begin of the tutorial section.
-    -->
-
-
-
-    <!--
-      Note:
-      All following examples use only one subobject (in nested layouts). But of course you can add more
-      objects. They will all follow the same rules (depending on the example receive, send or pipe events).
-
-      Some examples address objects by name. Those methods always address ALL objects with this name, no
-      matter where they are in the XML-file (before or after the addressing object). Of course this also
-      works with all amounts of objects from zero to infinity. In the examples I used two objects each.
-    -->
-
-
-    <!-- red -->
-    <!--
-      Standard:
-      Direct event-connection between an event-listener (Billboard) and an event source (DistanceTrigger).
-      Every fired event of the source is mapped to the "visibility" state of the listener.
-
-      This is a 1:1 mapping between event-listener and event-source.
-    -->
-    <Billboard position="300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
-      <events>
-        <visibility>
-          <DistanceTrigger position="300,100,0" distance=25 target="ControllableEntity" />
-        </visibility>
-      </events>
-    </Billboard>
-
-
-    <!-- orange -->
-    <!--
-      EventListener:
-      The EventListener object forwards all events from objects, whose names equal the "event" attribute
-      of the EventListener, to the enclosing object (Billboard).
-      In this case, both triggers have the name "trigger2" and thus both triggers send events to the Billboard.
-
-      The EventListener provides an 1:n mapping between one listener and multiple event-sources.
-    -->
-    <Billboard position="200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0>
-      <events>
-        <visibility>
-          <EventListener event="trigger2" />
-        </visibility>
-      </events>
-    </Billboard>
-    <DistanceTrigger name="trigger2" position="200,100,0" distance=25 target="ControllableEntity" />
-    <DistanceTrigger name="trigger2" position="200,100,100" distance=25 target="ControllableEntity" />
-
-
-    <!-- yellow -->
-    <!--
-      EventTarget:
-      The EventTarget object forwards the events, received from objects whithin the "events" subsection,
-      to all  objects whose names equal the "name" attribute.
-      In this case, the EventTarget forwards the event from the DistanceTrigger to all listeners with
-      name "bb3".
-
-      The EventTarget provides an n:1 mapping between several listeners and one event-source.
-    -->
-    <Billboard name="bb3" position="100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-    <Billboard name="bb3" position="100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-    <EventTarget target="bb3">
-      <events>
-        <visibility>
-          <DistanceTrigger position="100,100,0" distance=25 target="ControllableEntity" />
-        </visibility>
-      </events>
-    </EventTarget>
-
-
-    <!-- green -->
-    <!--
-      EventDispatcher:
-      The EventDispatcher catches events from objects in its "events" subsection. Those events are forwared
-      to all objects in the "targets" subsection. The EventDispatcher resembles the EventTarget, but
-      doesn't address objects with the "name" attribute. It rather places them directly inside the "targets"
-      subsection.
-      In this case, the EventDispatcher receives events from the DistanceTrigger and forwards those events
-      to the Billboard object.
-
-      The EventDispatcher provides an n:1 mapping between several targets (listeners) and one event source.
-    -->
-    <EventDispatcher>
-      <targets>
-        <Billboard position="0,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-      </targets>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,100,0" distance=25 target="ControllableEntity" />
-        </visibility>
-      </events>
-    </EventDispatcher>
-
-
-    <!-- turquoise -->
-    <!--
-      Combination:
-      By combinding the above three classes, namely EventDispatcher, EventTarget and EventListener, you can
-      extract the event logic completely from the actual objects (Billboards and DistanceTriggers).
-      In this case, both triggers (whith names "trigger5") send events to both Billboards (with names "bb5").
-
-      This combination allows an n:n mapping between event-listeners and event-sources.
-    -->
-    <Billboard name="bb5" position="-100,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-    <Billboard name="bb5" position="-100,150,100" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 />
-    <DistanceTrigger name="trigger5" position="-100,100,0" distance=25 target="ControllableEntity" />
-    <DistanceTrigger name="trigger5" position="-100,100,100" distance=25 target="ControllableEntity" />
-    <EventDispatcher>
-      <targets>
-        <EventTarget target="bb5" />
-      </targets>
-      <events>
-        <visibility>
-          <EventListener event="trigger5" />
-        </visibility>
-      </events>
-    </EventDispatcher>
-
-
-    <!-- blue -->
-    <!--
-      Mainstate:
-      Apart from the standard states (like activity and visibility), each object can have a mainstate.
-      You can define the mainstate with an xml-attribute: mainstate="state". "state" must be one of the
-      supported states of the object (except states which need the originator as a second argument). If
-      the mainstate is set (by default that's not the case), you can send events to the "mainstate" state.
-      This allows you to hide the actually affected state in the event-listener, while the event-source
-      just sends events.
-      Note that this example is exactly like the standard case, but the event is sent to the main-state,
-      which in turn is set to "visibility".
-    -->
-    <Billboard position="-200,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility">
-      <events>
-        <mainstate>
-          <DistanceTrigger position="-200,100,0" distance=25 target="ControllableEntity" />
-        </mainstate>
-      </events>
-    </Billboard>
-
-
-    <!-- violet -->
-    <!--
-      Event forwarding:
-      As a consequence of the mainstate, events can also be sent without any explicit declaration of
-      the targets state. This allows us to forward events from an event-source directly to a bunch of
-      event-listeners. The events are automatically piped into the mainstate. Therefore the listeners
-      have to declare their main-state.
-      In this example, the DistanceTrigger forwards the events to the Billboards main-state (visibility).
-      This does the same like the example above, but instead of piping events backwards from the source
-      into the mainstate of the listener, we're forwarding the event implicitly to the mainstate.
-    -->
-    <DistanceTrigger position="-300,100,0" distance=25 target="ControllableEntity">
-      <eventlisteners>
-        <Billboard position="-300,150,0" material="Examples/Flare" colour="1.0, 1.0, 1.0" visible=0 mainstate="visibility" />
-      </eventlisteners>
-    </DistanceTrigger>
-
-
-
-    <!--
-      End of the tutorial section.
-    -->
-
-
-
-    <!--
-      The following example shows again the red (standard layout) and the violet (event forwarding) example,
-      but this time with a memoryless state (spawn) from the ParticleSpawner instead of the boolean state
-      (visibility) in the other examples.
-    -->
-    <Billboard position=" 300,100,300" material="Examples/Flare" colour="1.0, 0.0, 0.0" />
-    <Billboard position="-300,100,300" material="Examples/Flare" colour="1.0, 0.0, 1.0" />
-    <ParticleSpawner position="300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0>
-      <events>
-        <spawn>
-          <DistanceTrigger position="300,100,300" distance=25 target="ControllableEntity" />
-        </spawn>
-      </events>
-    </ParticleSpawner>
-    <DistanceTrigger position="-300,100,300" distance=25 target="ControllableEntity">
-      <eventlisteners>
-        <ParticleSpawner position="-300,150,300" source="Orxonox/BigExplosion1part1" lifetime=3.0 autostart=0 mainstate="spawn" />
-      </eventlisteners>
-    </DistanceTrigger>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/fightInOurBack.oxw
===================================================================
--- code/branches/release2012/data/levels/fightInOurBack.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/fightInOurBack.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,531 +0,0 @@
-<LevelInfo
-  name = "Fight in our Back"
-  description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  screenshot = "fightinourback.png"  
-  tags = "mission" 
-/>
-
-<?lua
-    include("stats.oxo")
-    include("HUDTemplates3.oxo")
-    include("templates/lodInformation.oxt")
-    include("templates/spaceshipAssff.oxt")
-    include("templates/spaceshipPirate.oxt")
-    include("templates/spaceshipTransporter.oxt")
-?>
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!--Including Template for triggering on player-->
-
-<Template name=spaceshipassffplayer>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-      <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine />
-    </engines>
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-      <DistanceTriggerBeacon name="PlayerDistanceTrigger" /> <!--added DistanceTrigger-->
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponSettingsAssff.oxi")
-?>
-  </SpaceShip>
-</Template>
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-      <EffectContainer condition="idle">
-      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="-7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <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" />
-      <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" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <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" />
-      <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" />
-    </EffectContainer>
-<!--    <EffectContainer condition="brake">
-      <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 />
-      <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 />
-      <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 />
-      <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 />
-    </EffectContainer>
--->
-  </MultiStateEngine>
-</Template>
-<!--*****************************************************************************************************************************************************************************************-->
-<Level
-  name="Fight in our back"
-  description="Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  gametype=Mission
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-    <!-- Ausgang: Szene ===> ambientlight/skybox -->
-    <Scene
-     ambientlight="0.8,0.8,0.8"
-     skybox="Orxonox/skyBoxBasic"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <!--Light: noch zu aendern -->
-        <Light type=directional position="0,0,0" direction="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
-
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!--Quests-->
-    <GlobalQuest id="FightInOurBack.DiscoveryMission_">
-        <QuestDescription title="Discovery mission" description="Your team has to scout out this sector." failMessage="You failed!" completeMessage="You won. You have reached the end of this level." />
-        <subquests>
-            <GlobalQuest id="FightInOurBack.FollowYourGroupLeader">
-                <QuestDescription title="Follow your group leader" description="Your task is to follow the team leader and to destroy all the enemy spaceships on your way!" failMessage="You failed!" completeMessage="Good job!" />
-            </GlobalQuest>
-            <GlobalQuest id="FightInOurBack.TransportersAhead">
-                <QuestDescription title="Transporters ahead" description="This is a lucky day for us. We have found supplies that the enemy is transporting in these Transporters. We have to destroy them." failMessage="You failed!" completeMessage="Good job!" />
-            </GlobalQuest>
-            <GlobalQuest id="FightInOurBack.TheySentUsAssistance">
-                <QuestDescription title="They sent us assistance" description="The transporters will surely be heavily protected but our base sent us assistance. It should now be easier to destroy them." failMessage="You failed" completeMessage="Good job!" />
-            </GlobalQuest>
-        </subquests>
-    </GlobalQuest>
-
-
-<!--Quests____END-->
-<!--*****************************************************************************************************************************************************************************************-->
-
-
-<!--Player's Spawnpoints -->
-        <!--Spieler Spawnpoint ===> position/direction--> <!-- funktioniert noch nicht ab naechtem Mal wahrscheinlich-->
-        <SpawnPoint position="0,50,25" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="true" >
-            <events>
-                <activity>
-                    <EventListener event="activateFirstSpawnpoint" />
-                </activity>
-            </events>
-        </SpawnPoint>
-
-        <SpawnPoint position="10000,0,3000" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="false" >
-            <events>
-                <activity>
-                    <EventListener event="activateSecondSpawnpoint" />
-                </activity>
-            </events>
-        </SpawnPoint>
-
-<!--Player's Spawnpoint END-->
-
-<!--Launching Quests -->
-        <QuestEffectBeacon position="0,50,25" times="1">
-            <effects>
-                <AddQuest questId="FightInOurBack.DiscoveryMission_" />
-                <AddQuest questId="FightInOurBack.FollowYourGroupLeader" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="FightInOurBack_MainStart_FollowStart"/>
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger name="FightInOurBack_MainStart_FollowStart" position="0,0,0" distance="50" target="Pawn" beaconMode="identify" targetname="PlayerDistanceTrigger" />
-                <!--<Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />-->
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="8000,0,3100" times=1 >
-            <effects>
-                <AddQuest questID="FightInOurBack.TransportersAhead" />
-                <AddQuest questID="FightInOurBack.TheySentUsAssistance" />
-                <CompleteQuest questID="FightInOurBack.FollowYourGroupLeader" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="FightInOurBack_FollowEnd_DTranspStart_AssisStart" />
-                </execute>
-            </events>
-            <attached>
-                <!--<Billboard position="0,0,0" colour="1,1,1" material="Examples/Flare" />-->
-                <DistanceTrigger name="FightInOurBack_FollowEnd_DTranspStart_AssisStart" position="0,0,0" distance="1000" target="Pawn" beaconMode="identify" targetname="PlayerDistanceTrigger" stayactive=1 activations=1 />
-            </attached>
-        </QuestEffectBeacon>
-
-<!---->
-
-<!--Launching Quests END -->
-
-<!--Creating Transporters OK-->
-
-
-<?lua for i=0,0,1 do
-x=800
-health=1500
-?>
-    <!--Transporter 1-->
-    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
-    <events>
-    <trigger>
-        <SpaceShip position="<?lua print(3800-i*x) ?>,0,3000" lookat="<?lua print(4800-i*x) ?>,0,4000" health="<?lua print(health) ?>" maxhealth="<?lua print(health) ?>" initialhealth="<?lua print(health) ?>" >
-            <templates>
-                   <Template link=spaceshipTransporter />
-             </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=1000 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(14800-i*x) ?>,0,3000"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip><!---->
-    </trigger>
-    </events>
-    </EventTrigger>
-<?lua end ?>
-
-
-<?lua for j=0,1,1 do
-health=1300
-x=800
-z=j*300
-?>
-    <!--Transporter 2,3-->
-    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
-    <events>
-    <trigger>
-        <SpaceShip position="<?lua print(2600+x) ?>,0,<?lua print(3150-z) ?>" lookat="<?lua print(3500+x) ?>,0,<?lua print(4150-z) ?>" health="<?lua print(health) ?>" maxhealth="<?lua print(health) ?>" initialhealth="<?lua print(health) ?>" >
-            <templates>
-                   <Template link=spaceshipTransporter />
-             </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=1000 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(13500+x) ?>,0,<?lua print(3150-z) ?>"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip><!---->
-    </trigger>
-    </events>
-    </EventTrigger>
-<?lua end ?>
-
-
-<!--Creating Transporters END _-->
-
-<!--Creating player's team OK-->
-        <!--Spaceships team 0 (player:team=0)-->
-        <SpaceShip position="50,0,0" lookat="2050,0,-1000" health="500" maxhealth="500" initialhealth="500" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2050,0,-1000" />
-                        <Model mesh="cube.mesh" scale=0 position="6050,0,0" />
-                        <Model mesh="cube.mesh" scale=0 position="10050,0,3000" />
-                        <Model mesh="cube.mesh" scale=0 position="3050,0,3000" />
-                        <Model mesh="cube.mesh" scale=0 position="-4050,0,3000" />
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-        <!--Second Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,100" lookat="2000,0,-950" health="500" maxhealth="400" initialhealth="400" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2000,0,-900" />
-                        <Model mesh="cube.mesh" scale=0 position="6000,0,0" />
-                        <Model mesh="cube.mesh" scale=0 position="10000,0,3100" />
-                        <Model mesh="cube.mesh" scale=0 position="3000,0,3100" />
-                        <Model mesh="cube.mesh" scale=0 position="-4000,0,3100"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-        <!--third Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,-100" lookat="2000,0,-1050" health="500" maxhealth="400" initialhealth="400" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2000,0,-1100" />
-                        <Model mesh="cube.mesh" scale=0 position="6000,0,-100" />
-                        <Model mesh="cube.mesh" scale=0 position="10000,0,2900" />
-                        <Model mesh="cube.mesh" scale=0 position="3000,0,2900" />
-                        <Model mesh="cube.mesh" scale=0 position="-4000,0,2900" />
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-<!--Creating player's team END  -->
-
-
-<!--Asteroids (field OK -->
-
-<?lua for i=0,100,1 do
-x=math.random(250,4000)
-y=math.random(-500,500)
-z=math.random(1000,2000)
-scale=math.random(20,70)
-?>
-<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>">
-    <attached>
-        <Model scale="<?lua print(scale) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
-    </attached>
-    <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
-    </collisionShapes>
-</MovableEntity>
-<?lua end ?>
-
-<!--Asteroids (field) END -->
-
-<!--Asteroids (random) END OK-->
-
-<?lua for i=0,150,1 do
-x=math.random(-8000,8000)
-y=math.random(-8000,8000)
-z=math.random(-8000,8000)
-?>
-<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>" >
-    <attached>
-        <Model scale="<?lua print(math.random(20,70)) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
-    </attached>
-    <collisionShapes>
-            <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
-        </collisionShapes>
-</MovableEntity>
-<?lua end ?>
-
-<!--Asteroids (random) END -->
-
-<!--Creating spaceships (player's team) OK-->
-<!---->
-<!--Trigger to activate this Team (TEAM NO 1)-->
-    <DistanceTrigger name="activateTeam0No1" position="8000,0,3100" distance="1000" target="Pawn" beaconMode="identify" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
-
-<!--TEAM NO 1 (activationType : distance || killing a spaceship what belongs to TEAM 0 NO 0)-->
-<?lua for i=0,14,1 do
-x=math.random(-500,500)
-y=math.random(-300,300)
-z=math.random(-300,300)
-?>
-    <EventTrigger name="activateTeam0No1" activations=1 stayactive="true">
-        <events>
-            <trigger>
-                <SpaceShip position="<?lua print(x+4500) ?>,<?lua print(y) ?>,<?lua print(z+6000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
-                    <templates>
-                        <Template link=spaceshipassff />
-                    </templates>
-                    <controller>
-                        <WaypointPatrolController alertnessradius=2100 team=0 active=false>
-                            <waypoints>
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4500+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(x-4000) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                            </waypoints>
-                            <events>
-                                <activity>
-                                    <EventListener event="activateTeam0No1" />
-                                </activity>
-                            </events>
-                        </WaypointPatrolController>
-                    </controller>
-                </SpaceShip>
-            </trigger>
-        </events>
-    </EventTrigger>
-
-
-<?lua end ?>
-
-<!---->
-<!--Creating spaceships (player's team) END -->
-
-<!--Creating spaceships (enemy) OK-->
-<!---->
-<!--TEAM 1 NO 1 (activationType : killing a Transporter || killing a spaceship what belongs to TEAM 1 NO 1)-->
-<?lua for i=0,11,1 do
-x=math.random(-500,500)
-y=math.random(-300,300)
-z=math.random(-300,300)
-?>
-    <EventTrigger name="activateTeam1No1" activations=1 stayactive="true" >
-        <events>
-            <trigger>
-                <SpaceShip position="<?lua print(x+3800) ?>,<?lua print(y+3000) ?>,<?lua print(z+3000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
-                    <templates>
-                        <Template link=spaceshippirate />
-                    </templates>
-                    <controller>
-                        <WaypointPatrolController alertnessradius=5000 team=1 active=false>
-                            <waypoints>
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                            </waypoints>
-                            <events>
-                                <activity>
-                                    <EventListener event="activateTeam1No1" />
-                                </activity>
-                            </events>
-                        </WaypointPatrolController>
-                    </controller>
-                </SpaceShip>
-            </trigger>
-        </events>
-    </EventTrigger>
-
-<?lua end ?>
-<!---->
-<!--Creating spaceships (enemy) END -->
-
-<!--Enemies on the way to the transporters -->
-
-<?lua for i=0,1,1 do
-z=math.random(-300,300)
-?>
-<!--NO 1-->
-        <SpaceShip position="<?lua print(5900+i*100) ?>,0,-3000" lookat="2500,0,-1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(2500+100*i) ?>,0,-1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-
-<!--NO 4-->
-        <SpaceShip position="<?lua print(9000) ?>,13000,<?lua print(z*i+3000) ?>" lookat="1000,0,3000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(10000) ?>,0,<?lua print(3000+z*i) ?>" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-
-<!--NO 3-->
-        <SpaceShip position="<?lua print(200+13000) ?>,0,10000" lookat="8000,0,1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(200+8000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua for i=0,1,1 do ?>
-        <SpaceShip position="<?lua print(i*400+13000) ?>,100,10000" lookat="8000,0,1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(i*400+8000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-
-<!--NO 2-->
-<?lua for i=0,3,1 do ?>
-        <SpaceShip position="<?lua print(math.random(5500,6500)+2000) ?>,0,1000" lookat="2500,0,-1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1250" />
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,250,1000" />
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-<!--Creating spaceships (enemy) END -->
-
-<Trigger invert=true name="activateFirstSpawnpoint">
-    <DistanceTrigger name="activateSecondSpawnpoint" position="10000,0,3000" distance="1000" target="Pawn" beaconMode="identify" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
-</Trigger>
-
-    </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/gallery.oxw
===================================================================
--- code/branches/release2012/data/levels/gallery.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/gallery.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,195 +0,0 @@
-<!-- Collection of almost all models in orxonox -->
-<LevelInfo
- name = "Gallery"
- description = "Collection of almost all models."
- tags = "test, showcase"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-
-<!---
-    Gallery:
-    all Objects are organized in columns
----->
-
-<!--- Whole Objects --->
-      <Model position="0,0,-120" yaw="90" pitch="0" roll="0" scale="1" mesh="HydroHarvester.mesh" />
-
-      <Model position="0,30,-130" yaw="90" pitch="-90" roll="0" scale=1 mesh="DuBall2.mesh" />
-      <Model position="0,30,-110" yaw="90" pitch="-90" roll="0" scale=1 mesh="DuBall1.mesh" />
-
-
-
-
-
-
-
-
-
-<!--- PLANETS --->
-      <!--Model position="0,0,-80" yaw="90" pitch="-90" roll="0" scale="1" mesh="planet.mesh" /-->
-      <Model position="0,20,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="iceplanet.mesh" />
-      <Model position="0,40,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/earth.mesh" />
-      <Model position="0,60,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/moon.mesh" />
-      <Model position="0,80,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/sol.mesh" />
-      <Model position="0,-20,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/ganymede.mesh" />
-      <Model position="0,-40,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/jupiter.mesh" />
-      <Model position="0,-60,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/muunilinst.mesh" />
-      <Model position="0,-80,-80" yaw="90" pitch="-90" roll="0" scale="5" mesh="planets/planet3.mesh" />
-
-
-
-<!--- WEAPONS --->
-      <!--Model position="0,0,-40" yaw="90" pitch="-90" roll="0" scale="1" mesh="stunweapon.mesh" /-->
-      <Model position="0,20,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun.mesh" />
-      <Model position="0,40,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="LightningGun-s.mesh" />
-      <Model position="0,60,-40" yaw="90" pitch="-90" roll="0" scale="1.5" mesh="laserbeam.mesh" />
-      <Model position="0,80,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="rocket.mesh" />
-      <Model position="0,-20,-40" yaw="90" pitch="-90" roll="0" scale="5" mesh="hs-w01.mesh" />
-      <Model position="0,-40,-40" yaw="90" pitch="-90" roll="0" scale="5" mesh="hs-w01s.mesh" />
-      <Model position="0,-60,-40" yaw="90" pitch="-90" roll="0" scale="2" mesh="hs-w01_reduced.mesh" />
-      <Model position="0,-80,-40" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="Spacebomb.mesh" />
-
-    
-<!--- SPACESHIPS --->
-      <Model position="0,0,0" yaw="90" pitch="-90" roll="0" scale="4" mesh="assff.mesh" />
-      <Model position="0,20,0" yaw="90" pitch="-90" roll="0" scale="4" mesh="pirate.mesh" />
-      <Model position="0,40,0" yaw="90" pitch="-90" roll="0" scale="0.7" mesh="Carrier.mesh" />
-      <Model position="0,60,0" yaw="90" pitch="-90" roll="0" scale="1" mesh="ghost.mesh" />
-      <Model position="0,80,0" yaw="90" pitch="-90" roll="0" scale="1" mesh="h2_green.mesh" />
-      <Model position="0,-20,-10" yaw="180" pitch="-90" roll="0" scale="4" mesh="HXY.mesh" />
-      <Model position="0,-40,0" yaw="90" pitch="-90" roll="0" scale="1" mesh="spacecruiser.mesh" />
-      <Model position="0,-60,0" yaw="90" pitch="-90" roll="0" scale="1" mesh="swallow_mat.mesh" />
-
-      <Model position="0,-80,0" yaw="0" pitch="0" roll="0" scale="1" mesh="Transporter.mesh" />
-
-<!--- ASTEROIDS --->
-      <Model position="0,0,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast1.mesh" />
-      <Model position="0,20,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast2.mesh" />
-      <Model position="0,40,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast3.mesh" />
-      <Model position="0,60,40" yaw="90" pitch="-90" roll="0" scale="3" mesh="ast4.mesh" />
-      <Model position="0,-20,40" yaw="90" pitch="-90" roll="0" scale="4" mesh="ast5.mesh" />
-      <Model position="0,-40,40" yaw="90" pitch="-90" roll="0" scale="4" mesh="ast6.mesh" />
-      <Model position="0,-60,40" yaw="90" pitch="-90" roll="0" scale="5" mesh="asteroid_ice.mesh" />
-      <Model position="0,-80,40" yaw="90" pitch="-90" roll="0" scale="5" mesh="asteroid_UV.mesh" />
-
-
-<!--- Satellites & co --->
-      <Model position="0,0,80" yaw="90" pitch="-90" roll="0" scale="3" mesh="satellite.mesh" />
-      <Model position="0,20,80" yaw="90" pitch="0" roll="0" scale="3" mesh="broke-satellite.mesh" />
-      <Model position="0,40,80" yaw="90" pitch="-90" roll="0" scale="3" mesh="satellitedish.mesh" />
-      <Model position="0,60,80" yaw="90" pitch="-90" roll="0" scale="3" mesh="SolarPanel.mesh" />
-      <Model position="0,80,80" yaw="90" pitch="0" roll="0" scale="2" mesh="drone.mesh" />
-      <Model position="0,-20,80" yaw="90" pitch="0" roll="0" scale="3" mesh="drone.mesh" />
-      <Model position="0,-40,80" yaw="90" pitch="-90" roll="0" scale="4" mesh="Thruster.mesh" />
-
-
-
-
-<!--- ABSTRACT SHAPES --->
-      <Model position="0,0,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="sphere.mesh" />
-      <!--Model position="0,20,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="blackcube.mesh" /-->
-      <Model position="0,40,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="cube.mesh" />
-      <Model position="0,60,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="cube_green.mesh" />
-      <Model position="0,80,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="cube_orange.mesh" />
-      <Model position="0,-20,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="CubeGround.mesh" />
-      <Model position="0,-40,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="cube_red.mesh" />
-      <Model position="0,-60,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="testcube.mesh" />
-      <Model position="0,-80,120" yaw="90" pitch="-90" roll="0" scale="3" mesh="cylinder.mesh" />
-
-
-<!--- SPACEJUNK --->
-      <Model position="0,0,160" yaw="90" pitch="-90" roll="0" scale="8" mesh="debris-steelbeam.mesh" />
-      <Model position="0,20,160" yaw="90" pitch="-90" roll="0" scale="2" mesh="Thruster.mesh" />
-      <Model position="0,40,160" yaw="90" pitch="-90" roll="0" scale="1" mesh="crate.mesh" />
-      <Model position="0,60,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-fueltank.mesh" />
-      <Model position="0,80,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-glass.mesh" />
-      <!--Model position="0,-20,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-pile01.mesh" />
-      <Model position="0,-40,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-pile02.mesh" />
-      <Model position="0,-60,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-pile03.mesh" />
-      <Model position="0,-80,160" yaw="90" pitch="-90" roll="0" scale="3" mesh="debris-plane.mesh" />
-
-
-
-<!--- STUFF --->
-      <Model position="0,0,200" yaw="90" pitch="-90" roll="0" scale="3" mesh="can.mesh" />
-      <Model position="0,20,200" yaw="90" pitch="-90" roll="0" scale="3" mesh="cokebottle.mesh" />
-      <Model position="0,40,200" yaw="90" pitch="-90" roll="0" scale="3" mesh="Tower.mesh" />
-      <!--Model position="0,60,200" yaw="90" pitch="-90" roll="0" scale="3" mesh="Tower_ME.mesh" /-->
-      <!--Model position="0,80,200" yaw="90" pitch="-90" roll="0" scale="5" mesh="SmallPart1.mesh" /-->
-      <Model position="0,-20,200" yaw="90" pitch="-90" roll="0" scale="4" mesh="raceCheckPoint.mesh" />
-      <Model position="0,-40,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="Spacegate.mesh" />
-
-      <Model position="0,-60,200" yaw="90" pitch="-90" roll="0" scale="0.5" mesh="BigSpacegate.mesh" />
-      <!--Model position="0,-80,200" yaw="90" pitch="-90" roll="0" scale="5" mesh="SmallPart2" /> <!--- WHY doesn't it load ??--->
-
-<!--- The REST --->
-      <Model position="0,0,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="axes.mesh" />
-      <Model position="0,20,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="BodyDebris1.mesh" />
-      <Model position="0,40,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="CockpitDebris.mesh" />
-      <Model position="0,60,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="CuboidBody.mesh" />
-      <Model position="0,80,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="CuboidConnBody.mesh" />
-      <Model position="0,-20,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="CuboidConnection.mesh" />
-      <Model position="0,-40,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="CuboidLandingZone.mesh" />
-      <Model position="0,-60,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="DoubleCuboidBody.mesh" />
-      <Model position="0,-80,240" yaw="90" pitch="-90" roll="0" scale="1" mesh="plane.mesh" />
-      <Model position="0,-100,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="WingDebris1.mesh" />
-      <Model position="0,-120,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="WingDebris2.mesh" />
-      <Model position="0,-140,240" yaw="90" pitch="-90" roll="0" scale="5" mesh="SemiCircleCockpit.mesh" />
-      <Model position="0,-160,240" yaw="90" pitch="-90" roll="0" scale="1" mesh="Playfield_ME.mesh" />
-
-
-
-
-
-
-<!-- BILLBOARDS - Flares -->
-    <Billboard position="-400,0,0" material="Flares/ringflare" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,60,0" material="Flares/ringflare2" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,120,0" material="Flares/point_lensflare" colour="0.7,0.4,0.1" scale=0.5/>
-    <Billboard position="-400,180,0" material="Flares/Flare" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,-60,0" material="Flares/backlightflare" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,-120,0" material="Flares/ThrusterFlare1" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,-180,0" material="Flares/LightningBall_1" colour="0.7,0.4,0.1" scale=1/>
-    <Billboard position="-400,-240,0" material="Portals/Default" />
-
-
-
-<!-- Particle Emitters -->
-    <ParticleEmitter pitch=-135 roll=30 position="-400,0,300" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
-
-
-
-
-
-
-
-
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi
===================================================================
--- code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/includes/weaponSettingsAssff2.oxi	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,55 +0,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15.0,-1.5,0" />
-      <WeaponSlot position=" 15.0,-1.5,0" />
-      <WeaponSlot position="    0,   0,0" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-      <WeaponSet firemode=2 />
-      <WeaponSet firemode=3 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
-          <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="-1.9,-.5,1" scale=".5" />
-            <BlinkingBillboard position="-1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0 healthamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" >
-            <attached>
-                <ParticleEmitter position="0,0,6.2" source="Orxonox/weaponshoot" />
-            </attached>
-          </HsW01>
-          <HsW01 mode=0 munitionpershot=0 delay=0 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" shielddamage=23 />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="1.9,-.5,1" scale=".5"/>
-            <BlinkingBillboard position="1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0     healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 healthdamage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" shielddamage=23 />
-        </Weapon>
-        <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
-          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-        <!--Weapon>
-          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
-        </Weapon-->
-      </WeaponPack>
-    </weapons>

Deleted: code/branches/release2012/data/levels/myTestLevel.oxw
===================================================================
--- code/branches/release2012/data/levels/myTestLevel.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/myTestLevel.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,39 +0,0 @@
-<LevelInfo
- name = "MyTestLevel"
- description = "A level to test the Class SpaceBoundaries."
- tags = "test"
- screenshot = "mytestlevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-    <SpawnPoint team=0 position="0,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    
-    <SpaceBoundaries warnDistance="1" maxDistance="200" showDistance="150" reactionMode="0" healthDecrease="0.9" position="0,0,0"/>
-    
-    <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Flares/backlightflare" scale=1 />
-    
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/notifications.oxw
===================================================================
--- code/branches/release2012/data/levels/notifications.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/notifications.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,53 +0,0 @@
-<LevelInfo
- name = "Notifications showcase"
- description = "Level to test and showcase notifications."
- tags = "test, showcase"
- screenshot = "notificationsshowcase.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-    <templates>
-        <Template link=lodtemplate_default />
-    </templates>
-    <?lua include("includes/notifications.oxi") ?>
-
-    <Scene
-        ambientlight = "0.5, 0.5, 0.5"
-        skybox       = "Orxonox/skyBoxBasic"
-    >
-
-    <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" />
-
-    <CommandNotification preMessage="Open the PickupInventory by pressing '" postMessage="'." command="OrxonoxOverlay toggleVisibility PickupInventory">
-        <events>
-            <trigger>
-                <DistanceTrigger name=trigger position="0,0,-100" distance=10 target="Pawn" />
-            </trigger>
-        </events>
-    </CommandNotification>
-    <Billboard position="0,0,-100" colour="1.0,1.0,0" material="Examples/Flare" />
-
-    <SimpleNotification message="Awesome!!!">
-        <events>
-            <trigger>
-                <DistanceTrigger name=trigger position="0,0,100" distance=10 target="Pawn" />
-            </trigger>
-        </events>
-    </SimpleNotification>
-    <Billboard position="0,0,100" colour="1.0,0,1.0" material="Examples/Flare" />
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-        <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 />
-    <?lua end ?>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/pickups.oxw
===================================================================
--- code/branches/release2012/data/levels/pickups.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/pickups.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,188 +0,0 @@
-<LevelInfo
- name = "Pickups showcase"
- description = "Level to test and showcase pickups."
- tags = "test, showcase"
- screenshot = "pickupsshowcase.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
-    <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" />
-    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <!-- Shield pickups -->
-
-    <PickupSpawner pickup=smallshieldpickup position="-25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=mediumshieldpickup position="0,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=hugeshieldpickup position="25,-25,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- Health pickups -->
-
-    <PickupSpawner pickup=smallhealthpickup position="-25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    <PickupSpawner pickup=mediumhealthpickup position="0,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    <PickupSpawner pickup=hugehealthpickup position="25,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    <PickupSpawner pickup=crazyhealthpickup position="50,0,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-
-    <!-- Speed pickups -->
-
-    <PickupSpawner pickup=smallspeedpickup position="-25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-    <PickupSpawner pickup=mediumspeedpickup position="0,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-    <PickupSpawner pickup=hugespeedpickup position="25,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-    <PickupSpawner pickup=smalljumppickup position="50,25,-125" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-
-    <!-- Invisible pickups -->
-
-    <PickupSpawner pickup=smallinvisiblepickup position="-25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=mediuminvisiblepickup position="0,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=hugeinvisiblepickup position="25,50,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- Meta pickups -->
-
-    <Template name=usemetapickup baseclass=MetaPickup>
-      <MetaPickup representation="use" metaType="use" />
-    </Template>
-    
-    <Template name=dropmetapickup baseclass=MetaPickup>
-      <MetaPickup representation="drop" metaType="drop" />
-    </Template>
-    
-    <Template name=destroymetapickup baseclass=MetaPickup>
-      <MetaPickup metaType="destroy" />
-    </Template>
-    
-    <Template name=destroycarriermetapickup baseclass=MetaPickup>
-      <MetaPickup metaType="destroyCarrier" />
-    </Template>
-    
-    <PickupSpawner pickup=usemetapickup position="-25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=dropmetapickup position="0,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=destroymetapickup position="25,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-    <PickupSpawner pickup=destroycarriermetapickup position="50,75,-125" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- Pickup Collection pickups -->
-
-    <PickupSpawner pickup=triplehealthspeedinvisibilitypickup position="-50,25,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    
-    <!-- Drone pickup -->
-    
-    <PickupSpawner pickup=dronepickup position="-50,50,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    
-    <!-- DamageBoost pickup -->
-    
-    <PickupSpawner pickup=smalldamageboostpickup position="-50,75,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    <PickupSpawner pickup=mediumdamageboostpickup position="-50,100,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    <PickupSpawner pickup=largedamageboostpickup position="-50,125,-125" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-    
-    <!-- Other pickups -->
-
-    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
-    <PickupRepresentation
-      name = "MediumHealth"
-      pickupName = "Medium Health Pack"
-      pickupDescription = "Once used adds a medium amout of health to the ship."
-      spawnerTemplate = "mediumhealthpickupRepresentation"
-      inventoryRepresentation = "MediumHealth"
-    />
-
-    <Template name=continuoushealthpickup baseclass=HealthPickup>
-      <HealthPickup representation="MediumHealth" health=500 activationType=immediate healthRate=10 durationType=continuous />
-    </Template>
-    
-    <PickupSpawner pickup=continuoushealthpickup position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-    <PickupSpawner pickup="smallshrinkpickup" position="-25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-    <PickupSpawner pickup="mediumshrinkpickup" position="0,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-    <PickupSpawner pickup="hugeshrinkpickup" position="25,-50,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-    
-    <!-- @Objects: 4 boxes (uncontrolled pawns) -->
-    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
-        <events>
-          <visibility>
-            <EventListener event="flying4" />
-          </visibility>
-        </events>
-        <attached>
-            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
-        </collisionShapes>
-    </Pawn>
-
-    <Pawn team=1 health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 3">
-        <events>
-          <visibility>
-            <EventListener event="flying4" />
-          </visibility>
-        </events>
-        <attached>
-           <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
-        </collisionShapes>
-    </Pawn>
-
-    <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 2">
-        <events>
-          <visibility>
-            <EventListener event="flying4" />
-          </visibility>
-        </events>
-        <attached>
-           <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
-        </collisionShapes>
-    </Pawn>
-
-    <Pawn health=30 position="0,400,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1 RVName = "Box 1">
-        <events>
-          <visibility>
-            <EventListener event="flying4" />
-          </visibility>
-        </events>
-        <attached>
-            <Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" />
-        </attached>
-        <collisionShapes>
-           <BoxCollisionShape position="0,0,0" halfExtents="15,15,15" />
-        </collisionShapes>
-    </Pawn>
-
-    <!--StaticEntity position="0,-200,0" direction="0,-1,0" collisionType=static mass=500 friction=0.01 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="10,10,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="10,10,10" />
-      </collisionShapes>
-  </StaticEntity-->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/pirateAttack.oxw
===================================================================
--- code/branches/release2012/data/levels/pirateAttack.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/pirateAttack.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,562 +0,0 @@
-<LevelInfo
- name = "Pirate Attack"
- description = "Dani's Testlevel"
- tags = "mission"
- screenshot = "pirateattack.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Template name=spaceshipassffplayer defaults=0>
-  <SpaceShip template=spaceshipassff name=player>
-    <attached>
-    <DistanceTriggerBeacon name=Me/>
-    </attached>
-  </SpaceShip>
-</Template>
-
-<?lua
-    dofile("includes/CuboidSpaceStation.lua")
-?>
-    
-<Level
-name="Dani's Testlevel"
-description="Erste Versuche mit den Quests"
-gametype=Mission
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-    <Scene
-        ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skyBoxBasic"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <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" />
-
-
-          <GlobalQuest id="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551">
-        <QuestDescription title="Fight for freedom"
-                    description="Just a few hours ago, a group of pirates attacked an killed all your  squad members. Now you are very angry and you want to take revenge. Find the pirates and kill them!"
-                    failmessage="You are a loser, now the whole universe will be controlled by the pirates!"
-                    completeMessage="Yeah, you did it! You,ve eliminated the enemies. But why attacked them the Humans here? For tousands of years, there was peace in this sun system.
-                                You have to find out what happened exactly and why the pirates attacked..."/>
-            <subquests>
-                <GlobalQuest id="3159b4d4-bc86-4190-ba1d-4530668dfe31">
-                    <QuestDescription title="The stolen stick..."
-                    description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You received a message from your Headquarter: The pirates have stolen
-                            a very important memory stick with secret infos (military locations etc.), the holy stick. You must get it back! Otherwise the humans are in great danger..."
-                    failmessage=""
-                    completeMessage="Unbelievable, you annihilated all pirates and got the stolen memory stick.
-                                But wait... this isn't the memory stick you looked for, this stick is one from a pirate... anyway, it's helpful: There is a map saved on it, which leads you to a pirate - base. Perhaps you'll find more
-                                about their plans there..."/>
-                </GlobalQuest>
-                <GlobalQuest id="8d8ed3a6-74a6-4491-9172-26155cff151d">
-                    <QuestDescription title="Find the Base"
-                    description="Now you are in possession of the map and it should be easy to find the base. Because you are a Member of an elite-fight-squad, your ship has been pimped before you started your mission.
-                        They installed a very modern navigation system, which leads you precisely to your desired destination. Use it to find the pirate - base."
-                    failmessage=""
-                    completeMessage="The navigation system worked very well and now you should be near a pirate -base." />
-                    <hints>
-                        <QuestHint id="965101b3-26ce-4fcf-bc71-17cc2a87d2e9">
-                        <QuestDescription title="3 Ways?"
-                        description="The different ways leads you to the possible positions where the base could be. The problem is that the map is encrypted and your on board system is not
-                                able to decrypt it exactly. Therefore you have to try 3 possible ways...Tha base is Huge, but it could be that it's invisible when ou are in longer distance (some Big Ships
-                                have a special shield aroud them which make them invisible at longer range)."/>
-                        </QuestHint>
-                    </hints>
-                </GlobalQuest>
-                <GlobalQuest  id="9930a598-98bc-4ff8-8cc0-31311a6ccaaa">
-                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
-                </GlobalQuest>
-                <GlobalQuest id="9930a598-98bc-4ff8-8cc0-31311a6ccaab">
-                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
-                </GlobalQuest>
-                <GlobalQuest id="8a62408b-c47b-4e02-bd3d-06bb9ec0b363">
-                    <QuestDescription title="The Base"
-                    description="Yeah, you found the Base... now let's check if there is the important holy stick..."
-                    failmessage=""
-                    completeMessage="There it is, the Holy stick. Yes, you're right. It looks like a rocket because there are so many rockets in the universe, that it's nearly impossible to find the holy stick between them.
-                                Anyway, the pirates found the stick... another part which is confusing. Why did they know where the holy stick is? Perpaps they know more about the humans than you think."/>
-                </GlobalQuest>
-                <GlobalQuest id="85380d05-b791-45d1-82e9-01f0bc930367">
-                    <QuestDescription title="Find out more about the pirates"
-                    description= "Now, the Holy stick is back in your possession. Your new mission is to get some more infos about the pirates. You've got an info about a near mining company
-                    which delivers Hydrogen out of special asteroids. Hydrogen is a very rare ressource on earth and is delivered by a few great mining companys. There is no oil anymore on earth since many years.
-                    Therefore hydrogen became the most important energy source for all humans.
-                    But back to your mission. The mining company has it's own security. Ask some of their security staff if they know more about the pirates... it's actually your only hope to get more infos.
-                    You'll find the mining company at the near planet with the asteroid belt."
-                    failmessage=""
-                    completeMessage=""/>
-                </GlobalQuest>
-                <GlobalQuest id="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734">
-                    <QuestDescription title="Interesting..."
-                    description= "You're very lucky. The first security man has interesting infos about the pirates. He said that they made a few attacks in de last few weeks and they intensified the attacks in the last days...
-                    Shit, they attack one more time. Fight them back!"
-                    failmessage=""
-                    completeMessage=""/>
-                </GlobalQuest>
-            </subquests>
-            <hints>
-                <QuestHint id="2b85f32c-2433-4f1a-bdd4-f24d20c9403c">
-                    <QuestDescription title="Useful to know" description="Pirates like to hide themselves behind asteroids."/>
-                </QuestHint>
-            </hints>
-            <fail-effects>
-            </fail-effects>
-            <complete-effects>
-            </complete-effects>
-        </GlobalQuest>
-    
-          <ParticleSpawner position="0,0,0" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint1 team=0 active=true/>
-              </trigger>
-            </events>
-              </EventTrigger>
-            </spawn>
-          </events>
-          <attached>
-            <QuestEffectBeacon position="0,0,0" times=1>
-            <effects>
-                <AddQuest questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" />
-            </effects>
-            <events>
-                <execute>
-                <EventListener event=questbeacon1 />
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger name=questbeacon1 position="0,0,0" distance=100 target="Pawn" beaconMode="identify" targetname=Me/>
-            </attached>
-            </QuestEffectBeacon>
-          </attached>
-        </ParticleSpawner>
-    
-        <SpawnPoint position="600,300,-6000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint2 active=false/>
-    
-    
-    
-        <!-- Add second Quest-->
-        <QuestEffectBeacon position="250,-300,-1500" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="1.0,1.0,0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon2 targetname=Me position="0,0,0" target="Pawn" beaconMode="identify" distance=400 />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon2 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Hint to first Quest-->
-        <QuestEffectBeacon position="0,0,0" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon3  position="0,0,0" distance=300 target="Pawn" beaconMode="identify" targetname=Me delay="5" />
-                    </attached>
-                    <effects>
-                        <AddQuestHint hintId="2b85f32c-2433-4f1a-bdd4-f24d20c9403c" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon3 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!--Pirates killed... navi leads you to possible Base stations-->
-        <QuestEffectBeacon position="600,300,-6000" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="0,1.0,0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon4  position="0,0,0" distance=200 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-    
-                    <effects>
-                        <CompleteQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
-                        <AddQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
-                        <AddQuestHint hintId="965101b3-26ce-4fcf-bc71-17cc2a87d2e9" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon4 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!-- Wrong way 1-->
-        <QuestEffectBeacon position="7600,300,-8000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon5  position="0,0,0" distance=300 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon5 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Wrong way 2-->
-        <QuestEffectBeacon position="1600,2300,-10000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon8  position="0,0,0" distance=300 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon8 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Base found!-->
-        <QuestEffectBeacon position="4600,5300,-11000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon6  position="0,0,0" distance=600 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
-                        <AddQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
-                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
-                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon6 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-        <!--Stick found-->
-        <QuestEffectBeacon position="4800,5785,-10725" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon7  position="0,0,0" distance=30 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
-                        <AddQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon7 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!--Security Man found-->
-        <QuestEffectBeacon position="4000,4000,-20000" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="0,0,1.0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon9 position="0,0,0" distance=500 target="Pawn" beaconMode="identify" targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
-                        <AddQuest questId="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon9 />
-                        </execute>
-                    </events>
-        </QuestEffectBeacon>
-    
-    <!--Navigation System which shows possiple positions of base-->
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=Navi />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-
-            <?lua
-                for i = 0, 30
-                do
-            ?>
-        <Billboard position="<?lua print(i*1000/30+600) ?>,<?lua print(i*2000/30+300) ?>,<?lua print(-i*4000/30-6000) ?>" colour="1.0,0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:1600,2300,-10000-->
-        <Billboard position="<?lua print(i*7000/30+600) ?>,<?lua print(i*0/30+300) ?>,<?lua print(-i*2000/30-6000) ?>" colour="0,1.0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:7600,300,-8000-->
-        <Billboard position="<?lua print(i*4000/30+600) ?>,<?lua print(i*5000/30+300) ?>,<?lua print(-i*5000/30-6000) ?>" colour="0,0,1.0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:4600,5300,-11000-->
-            <?lua
-                end
-            ?>
-    
-    <!--Base&Stick spawn*****************************************************************-->
-    <StaticEntity scale=1 position="4650,5350,-11050" name=base visible=true active=true yaw=60>
-                <attached>
-                    <?lua
-                        createSpaceStationPar(9851,2,1,2,1,2,1,100)
-                    ?>
-                </attached>
-            </StaticEntity>
-    
-    <ParticleSpawner position="4650,5350,-11050" source="Orxonox/explosion1" name=base visible=false active=false loop=0/>
-    <Model position="4800,5785,-10725" scale=3 mesh="rocket.mesh" visible=true active=true name=base />
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=base />
-             <EventTarget target=navipirate1 />
-              <EventTarget target=navipirate2 />
-                </targets>
-                <events>
-                    <visibility>
-          <EventTrigger invert=true>
-            <events>
-              <trigger>
-                <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </visibility>
-                    <activity>
-                <EventTrigger invert=true>
-            <events>
-              <trigger>
-                             <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </activity>
-                </events>
-            </EventDispatcher>
-
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=base />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    
-    <!--Base&Stick spawn********end*****************************************************-->
-    
-    <!--Change spawnoint-->
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=spawnpoint1 />
-                </targets>
-                <events>
-                    <activity>
-                <EventTrigger invert=true>
-            <events>
-              <trigger>
-                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </activity>
-                </events>
-    
-            </EventDispatcher>
-            <EventDispatcher>
-                <targets>
-                    <EventTarget target=spawnpoint2/>
-                </targets>
-                <events>
-                    <activity>
-                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    <!--Change spawnoint end-->
-    
-    <!-- pirates -->
-        <?lua
-        for i = 1,1, 1
-        do
-        ?>
-            <SpaceShip position="<?lua print(math.random()*100)?>,<?lua print(math.random()*100)?>,<?lua print(math.random()*100-2000)?>">
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 active=true team=1>
-              <waypoints>
-                <StaticEntity position="0,<?lua print(math.random()*50)?> ,<?lua print(i*50 -2000) ?>" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-        <?lua
-        end
-        ?>
-    
-        <?lua
-        for i = 1,2, 1
-        do
-        ?>
-            <SpaceShip position="600,300,-6000">
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 active=true team=1>
-              <waypoints>
-                <StaticEntity position="600,300,-6000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-        <?lua
-        end
-        ?>
-    
-    <!-- Pirates at the end of wrong Navi line (get visible when you get near them)-->
-     <SpaceShip position="1600,2300,-10000" active=true visible=true name=navipirate1>
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 name=navipirate1 active=true team=1>
-              <waypoints>
-                <StaticEntity position="1600,2300,-10000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-    
-    <SpaceShip position="7600,300,-8000" active=true visible=true name=navipirate2>
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 name=navipirate2 active=true team=1>
-              <waypoints>
-                <StaticEntity position="7600,300,-8000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-        </SpaceShip>
-    
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=navipirate1 />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=navipirate2 />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    <!-- Pirates at the end of wrong Navi line **** end-->
-    
-    <!--Security man from mining corp.-->
-    <SpaceShip position="4000,4000,-20000">
-              <templates>
-            <Template link=spaceshipassff/>
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 team=0 active=false>
-              <waypoints>
-                <StaticEntity position="4000,4000,-20000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-    </SpaceShip>
-    
-    <!-- Asteroid field-->
-            <StaticEntity position="-400,2000,-7000">
-                <attached>
-                    <?lua
-                        for i = 1, 180
-                        do ?>
-                        <MovableEntity position="<?lua print(math.random() * 10000 -5000)?>, <?lua print(math.random() * 10000-5000) ?>, <?lua print(math.random() * 10000 -7000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-                            <attached>
-                                <Model scale="<?lua print(math.random() * 100) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-                            </attached>
-                        </MovableEntity>
-                    <?lua
-                        end
-                    ?>
-            </attached>
-        </StaticEntity>
-    <!--Planet with asteroid belt-->
-    <Planet mesh="iceplanet.mesh" position="2600,4300,-20000" scale=1000 atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f/>
-    <StaticEntity position="2600,4300,-20000" collisionType=static>
-          <collisionShapes>
-            <SphereCollisionShape radius="1000" />
-          </collisionShapes>
-                          <attached>
-                <?lua
-                for i = 1, 100
-                do
-                k=(math.random() * 2600 -1300)
-                if math.random()<0.5 then
-                l=(1300^2-k^2)^(0.5)
-                else
-                l=-(1300^2-k^2)^(0.5)
-                end
-                ?>
-    
-                <MovableEntity position="<?lua print(k) ?>,<?lua print(l) ?>, <?lua print(math.random() * 100) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-
-                    <attached>
-                    <Model scale="<?lua print(math.random() * 25) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-                    </attached>
-                </MovableEntity>
-                <?lua
-                end
-                ?>
-                            </attached>
-        </StaticEntity>
-    
-    </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/planets.oxw
===================================================================
--- code/branches/release2012/data/levels/planets.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/planets.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,97 +0,0 @@
-<LevelInfo
- name = "Planet Demonstration"
- description = "Demonstration of Planets"
- tags = "showcase"
- screenshot = "planetdemonstration.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-  include("templates/spaceshipHXY.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link="lodtemplate_default" />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyBoxBasic"
-  >
-
-    <WorldAmbientSound
-      ambientSource="AlphaCentauri.ogg"
-      looping="true"
-      playOnLoad="true"
-    />
-    
-    <Light
-      type="directional"
-      position="-10000,-10000,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"
-    />
-
-    <SpawnPoint
-      position="1500,0,0"
-      lookat="0,0,0"
-      spawnclass="SpaceShip"
-      pawndesign="spaceshipHXY"
-    />
-
-    <Planet
-      position="0,0,0"
-      scale="1000"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="10000000"
-      pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="1,0,0"
-      rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="1000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-
-    <Planet
-      position="10000,0,0"
-      scale="100"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="5000000"
-      pitch="0"
-      mesh="planets/muunilinst.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="1,0,0"
-      rotationrate="1.0"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="100" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/portals.oxw
===================================================================
--- code/branches/release2012/data/levels/portals.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/portals.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,106 +0,0 @@
- 
-<LevelInfo
- name = "Portals"
- description = "Level for testing portals"
- tags = "test"
- screenshot = "portals.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-
-    <Template name=PortalDefault>
-        <PortalEndPoint>
-            <attached>
-                <Model mesh="Spacegate.mesh" yaw="90"/>
-            </attached>
-        </PortalEndPoint>
-    </Template>
-
-    <PortalEndPoint position="0,0,0" id="1" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
-    <PortalEndPoint position="-300,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
-    <PortalLink fromID="1" toID="2" />
-    <PortalLink fromID="2" toID="1" />
-
-    <!--PickupSpawner pickup=dronepickup position="-200,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10" /-->
-
-    <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" />
-
-    <SpawnPoint position="200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-
-
-<!--
-    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="20" />
-      </collisionShapes>
-    </StaticEntity>
--->
-
-
-<!--
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
--->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentation.oxw
===================================================================
--- code/branches/release2012/data/levels/presentation.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentation.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,198 +0,0 @@
-<LevelInfo
- name = "Presentation"
- description = "Presentation Level"
- tags = "presentation"
- screenshot = "presentation.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.3, 0.3, 0.3"
-   skybox       = "Orxonox/Starbox"
-  >
-    <Light type=directional position="0,0,0" direction="1, -0.3, 0.3" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-    <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-
-    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
-    <!--StaticEntity position="0,0,0">
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="axes.mesh" />
-      </attached>
-    </StaticEntity -->
-
-    <!-- red sphere for phsics engine testing purposes-->
-    <!--StaticEntity position="40,0,0">
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-      </attached>
-    </StaticEntity-->
-
-    <!-- yellow cube for phsics engine testing purposes-->
-    <!--StaticEntity position="80,0,0">
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="cube.mesh" />
-      </attached>
-    </StaticEntity-->
-
-    <!-- Carrier with guns not implemented yet -->
-    <MovableEntity position="-2000,-1000,-2000" pitch="-90" roll="90">
-      <attached>
-        <Model position="0,0,0" scale=10 mesh="Carrier.mesh" />
-        <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
-        <Model position="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
-      </attached>
-    </MovableEntity>
-
-    <MovableEntity position="-300,200,-800" velocity="5,0,0" rotationaxis="1,0,0" rotationrate=0>
-      <attached>
-        <Model position="0,0,0" scale=10 mesh="satellite.mesh" />
-        <MovableEntity position="-4,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=50>
-          <attached>
-            <Model position="4,0,0" scale=10 mesh="satellitedish.mesh"/>
-          </attached>
-        </MovableEntity>
-        <ParticleEmitter pitch=-135 roll=30 position="-14, 3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
-        <ParticleEmitter pitch=135 roll=30 position="-14, 3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
-        <ParticleEmitter pitch=-45 roll=30 position="-14,-3.5,-2.5" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
-        <ParticleEmitter pitch=45 roll=30 position="-14,-3.5,-9" source="Orxonox/thruster3" lifetime=2.0 loop=1 startdelay=3.0 />
-      </attached>
-    </MovableEntity>
-
-    <MovableEntity scale=1.5 position="0,0,-300" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=90>
-      <events>
-        <activity>
-          <DistanceTrigger position="0,0,-300" distance=50 target="ControllableEntity" invert=1 />
-        </activity>
-      </events>
-      <attached>
-        <Model position="0,0,0" scale=10 mesh="ast1.mesh" />
-        <StaticEntity position="0,0,100">
-          <attached>
-            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
-            <MovableEntity position="0,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=500>
-              <attached>
-                <Model position="0,35,0" scale=2 mesh="ast1.mesh" />
-                <Model position="0,-35,0" scale=2 mesh="ast1.mesh" />
-                <Model position="35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/ExplosionComp4" />
-                  </attached>
-                </Model>
-                <Model position="-35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-                  </attached>
-                </Model>
-              </attached>
-            </MovableEntity>
-          </attached>
-        </StaticEntity>
-        <MovableEntity position="0,0,-100" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=200>
-          <attached>
-            <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
-            <Model position="0,0,-50" scale=3 mesh="ast1.mesh" />
-            <Model position="0,0,50" scale=3 mesh="ast1.mesh" />
-          </attached>
-        </MovableEntity>
-      </attached>
-    </MovableEntity>
-
-    <ExplosionChunk position="-500,0,-200" lifetime=3.0 loop=1/>
-
-    <ParticleSpawner position="-500,0,-200" source="Orxonox/ExplosionComp1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-200" source="Orxonox/ExplosionComp2" lifetime=3.0 loop=1 />
-
-    <ParticleSpawner position="0,0,100" source="Orxonox/ExplosionComp1" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-
-
-    <ParticleEmitter name=fireright position="200,0,0" source="Orxonox/fire3" active=false>
-      <events>
-        <activity>
-          <DistanceTrigger name=firetrigger1 position="200,0,0" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </ParticleEmitter>
-    <ParticleEmitter name=fireleft position="-200,0,0" source="Orxonox/fire3" active=true>
-      <events>
-        <activity>
-          <DistanceTrigger name=firetrigger2 position="-200,0,0" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </ParticleEmitter>
-    <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
-      <events>
-        <activity>
-          <EventListener event=firetrigger1 />
-          <EventListener event=firetrigger2 />
-        </activity>
-      </events>
-    </ParticleEmitter>
-
-
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=fireright />
-        <EventTarget target=firecenter />
-        <EventTarget target=fireleft />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="0,0,200" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-
-    <Model position="0,50,0" scale=3 mesh="assff.mesh">
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,50,0" distance=50 target="ControllableEntity" invert=1 />
-        </visibility>
-      </events>
-    </Model>
-
-
-    <Model position="0,0,200" scale=10 mesh="ast2.mesh" shadow=true />
-    <!--Model position="0,0,-200" scale=10 mesh="ast1.mesh" shadow=true /-->
-    <Model position="0,200,0" scale=10 mesh="ast3.mesh" shadow=true />
-    <Model position="0,-200,0" scale=10 mesh="ast4.mesh" shadow=true />
-    <Model position="200,0,0" scale=10 mesh="ast5.mesh" shadow=false />
-    <Model position="-200,0,0" scale=10 mesh="ast6.mesh" shadow=false />
-
-    <Model position="1000,-200,0" scale3D="1,100,100" mesh="ast1.mesh" />
-
-    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
-    <!--Model position="0,100,-100" pitch=-90 roll=-90 scale=4 mesh="pirate.mesh" />
-    <Model position="0,300,-100" pitch=-90 roll=-90 scale=4 mesh="spacecruiser.mesh" /-->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentation09.oxw
===================================================================
--- code/branches/release2012/data/levels/presentation09.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentation09.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,62 +0,0 @@
-<LevelInfo
- name = "Presentation X 3rd"
- description = "3rd Presentation level for Orxonox Convention X"
- tags = "presentation"
- screenshot = "presentationx3rd.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-  
-    <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" />
-
-
-    <SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-
-    <?lua
-      max = 20
-      for i = 1, max, 1
-      do
-        x = math.sin(i/max*6)*40000
-        y = math.cos(i/max*6)*40000
-        z = i*100
-    ?>
-      <?lua
-        for k = 1, 25, 1
-        do
-        j = math.random()
-      ?>
-
-      <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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-        </attached>
-        <?lua if i == 5 then ?><collisionShapes>
-          <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-        </collisionShapes> <?lua end ?>
-      </MovableEntity>
-    
-      <?lua end ?>
-    <?lua end ?>
-    
-    <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 />
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentation09b.oxw
===================================================================
--- code/branches/release2012/data/levels/presentation09b.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentation09b.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,376 +0,0 @@
-<LevelInfo
- name = "Presentation X2"
- description = "2nd Presentation level for Orxonox Convention X"
- tags = "presentation"
- screenshot = "presentationx2.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level
- gametype = "TeamDeathmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxSomeNebula"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-    
-    <Light type=directional position="0,0,0" direction="0.683, 0.289, 0.670" diffuse="1.0, 1.0, 1.0, 1.0" specular="1.0, 1.0, 1.0, 1.0" />
-
-    <SpawnPoint position="-3800, 2500, 1500" direction="-0.683, -0.289, -0.670"  spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <SpaceShip position="-3900,3000,1000">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4100,2600,1600">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4000,2500,1500">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4100,2700,1500">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0 />
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4150,2750,1550">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0 />
-      </controller>
-    </SpaceShip>
-
-    <PickupSpawner pickup=smalljumppickup position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
-    <PickupRepresentation
-      name = "MediumHealth"
-      pickupName = "Medium Health Pack"
-      pickupDescription = "Once used adds a medium amout of health to the ship."
-      spawnerTemplate = "mediumhealthpickupRepresentation"
-      inventoryRepresentation = "MediumHealth"
-    />
-
-    <Template name=onusehealthpickup baseclass=HealthPickup>
-      <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
-    </Template>
-
-    <PickupSpawner pickup=onusehealthpickup position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-    <PickupSpawner pickup=mediumhealthpickup position="2300, 4300, 2400" respawnTime="5" triggerDistance="20" />
-
-    <Billboard position="-2500, 2400, 1500" material="Examples/Flare" />
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=pirates />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="-2500, 2400, 1500" distance=250 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <WaypointPatrolController name=pirates alertnessradius=1000 team=1 active=false>
-            <waypoints>
-              <StaticEntity position="3100, 2000, 1500" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <?lua
-      for i = 1, 12, 1 do
-    ?>
-      <SpaceShip position="<?lua print(2800 + math.random() * 2000 - 1000) ?>,<?lua print(2500+ math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>" >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=0>
-            <waypoints>
-              <StaticEntity position="<?lua print(2800 + math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>,<?lua print(1500 + math.random() * 1000 - 500) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <Billboard position="2300, 4400, 2500" material="Examples/Flare" />
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=attacker />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="2300, 4400, 2500" distance=50 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <?lua
-      for i = 1, 12, 1 do
-    ?>
-      <SpaceShip position="<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(4800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>" >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController name=attacker alertnessradius=1000 team=0 active=false>
-            <waypoints>
-              <StaticEntity position="<?lua print(2800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(1500 + math.random() * 500 - 250) ?>" />
-              <StaticEntity position="<?lua print(5000 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>" />
-              <StaticEntity position="<?lua print(7500 + math.random() * 500 - 250) ?>,<?lua print(-2500 + math.random() * 500 - 250) ?>,<?lua print(-1500 + math.random() * 500 - 250) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <StaticEntity position="2800, 2500, 2500">
-      <attached>
-        <CheckPoint />
-        <Model position="400, 0, 0" scale="40" mesh="DuBall2.mesh"/>
-        <Model position="-400, 0, 0" scale="40" mesh="DuBall1.mesh"/>
-      </attached>
-    </StaticEntity>
-
-<!--
-    <Destroyer position="6500, -2000, -1000" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=500>
-      <attached>
-        <CheckPoint />
-        <Model position="0,0,0" scale="5" mesh="Carrier.mesh"/>
-        <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"
-        />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
--->
-
-    <Destroyer
-      position          = "6500,-2000,-1000"
-      collisionType     = dynamic
-      mass              = 100000
-      angularDamping    = 0.9999999
-      health            = 1000
-      maxhealth         = 1000
-      initialhealth     = 1000
-    >
-      <controller>
-        <WaypointPatrolController team=1 />
-      </controller>
-      <attached>
-        <Model mesh="Carrier.mesh" scale="5" />
-        <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"
-        />
-
-        <?lua
-          for i=0,8,1 do
-        ?>
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?> ,15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?>,-15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-        <?lua end ?>
-
-        <Backlight
-          scale=1
-          position=" 169, 75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-        <Backlight
-          scale=1
-          position=" 169, -75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <SpaceShip position="<?lua print(6200 + math.random() * 2000 - 1000) ?>,<?lua print(-1500 + math.random() * 1000 - 500) ?>,<?lua print(-700 + math.random() * 1000 - 500) ?>" >
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=1>
-            <waypoints>
-              <StaticEntity position="<?lua print(6000 + math.random() * 1000 - 500) ?>,<?lua print(-2000 + math.random() * 1000 - 500) ?>,<?lua print(-1000 + math.random() * 1000 - 500) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <?lua
-      for i = 1, 200, 1 do
-        x = math.random() * 100  + (i-70) * 100
-        y = math.random() * 3000 - 1500
-        z = math.random() * 3000 - 1500 + (i-100) * 10
-        s = math.random() * 60 + 30
-    ?>
-      <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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-    <?lua
-      elements = {"BodyDebris1.mesh", "CockpitDebris.mesh", "LightningGun.mesh", "WingDebris1.mesh", "WingDebris2.mesh", "satellitedish.mesh", "Thruster.mesh"}
-      sizes = {4, 4, 4, 4, 4, 10, 20}
-      
-      elements.length = function()
-        return table.getn(elements)
-      end
-      
-      for i = 1, 150, 1 do
-        x = math.random() * 750 - 4500
-        y = math.random() * 1000 + 2000
-        z = math.random() * 500 + 1000
-        e = math.floor(math.random()*elements.length()+1)
-    ?>
-
-      <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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationDM.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationDM.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationDM.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,100 +0,0 @@
-<LevelInfo
- name = "Presentation DM"
- description = "Presentation Level"
- tags = "presentation"
- screenshot = "presentationdm.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level
- gametype = "Deathmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-    <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" />
-
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <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 />
-    <?lua end ?>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-
-    <?lua
-      for i = 1, 100, 1 do
-        j = math.random()
-        scale = j * 50 + 5
-    ?>
-      <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(scale) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(scale) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(scale * 2.5) ?>" />
-        </collisionShapes>
-      </MovableEntity>
-    <?lua end ?>
-
-<!--
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
--->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationFS10.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationFS10.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationFS10.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,139 +0,0 @@
-<LevelInfo
- name = "Presentation XI"
- description = "1st Presentation level for Orxonox Convention XI"
- tags = "presentation"
- screenshot = "presentationxi.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-?>
-
-<?lua
-  include("templates/lodInformation.oxt")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipSwallow.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-?>
-
-<Level
- gametype = "TeamDeathmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
-    <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" />
-    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
-
-    <Billboard position="12.5, -30, -500" material="Banners/Pickups" scale="0.5"/>
-    <Billboard position="500, -30, -500" material="Banners/Drone" scale="0.5"/>
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=pirate />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="500, -50, -500" distance=20 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <Billboard position="1000, -30, -500" material="Banners/Formation" scale="0.5"/>
-    <Billboard position="1000, -50, -500" material="Examples/Flare" scale="0.5"/>
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=formation />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="1000, -50, -500" distance=20 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <SpaceShip position="500,0,-1500">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <AIController team=1 active=false name=pirate formationFlight=false passive=false />
-        </controller>
-    </SpaceShip>
-
-
-    <?lua
-      for i = 1, 10, 1 do
-        ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <AIController formationFlight=true passive=true team=0 name=formation active=false />
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-
-    <?lua
-      for i = 1, 10, 1 do
-        ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <AIController formationFlight=true passive=true team=1 name=formation active=false/>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <PickupSpawner pickup=dronepickup position="500,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- Shield pickups -->
-
-    <PickupSpawner pickup=hugeshieldpickup position="-25,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- Health pickups -->
-
-    <PickupSpawner pickup=hugehealthpickup position="0,-75,-500" triggerDistance="10" respawnTime="30" maxSpawnedItems="10" />
-
-    <!-- Speed pickups -->
-
-    <PickupSpawner pickup=hugespeedpickup position="25,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-    <PickupSpawner pickup=smalljumppickup position="50,-50,-500" triggerDistance="10" respawnTime="10" maxSpawnedItems="99" />
-
-    <!-- Invisible pickups -->
-
-    <PickupSpawner pickup=hugeinvisiblepickup position="0,-50,-500" triggerDistance="10" respawnTime="5" maxSpawnedItems="10" />
-
-    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
-    <PickupRepresentation
-      name = "MediumHealth"
-      pickupName = "Medium Health Pack"
-      pickupDescription = "Once used adds a medium amout of health to the ship."
-      spawnerTemplate = "mediumhealthpickupRepresentation"
-      inventoryRepresentation = "MediumHealth"
-    />
-
-    <Template name=onusehealthpickup baseclass=HealthPickup>
-      <HealthPickup representation="MediumHealth" health=50 activationType=onUse durationType=once />
-    </Template>
-
-    <PickupSpawner pickup=onusehealthpickup position="25,-75,-500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationFS102.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationFS102.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationFS102.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,106 +0,0 @@
-<LevelInfo
- name = "Presentation XI FPS 1st"
- description = "2nd Presentation level for Orxonox Convention XI, FPS"
- tags = "presentation"
- screenshot = "presentationxifps1st.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/FPS.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skyBoxBasic"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="fish.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-  
-  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-  
-  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-<?lua
-for i = 1, 10, 1
-do ?>
-    <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
-<?lua
-end
-?>
-
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationFS10Ed.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationFS10Ed.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationFS10Ed.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,180 +0,0 @@
-<LevelInfo
- name = "Presentation XI FPS 2nd"
- description = "3rd Presentation level for Orxonox Convention XI, FPS"
- tags = "presentation"
- screenshot = "presentationxifps2nd.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/FPS.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skyBoxBasic"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-
-  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-
-  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-
-   <StaticEntity position="6000,0,10250" direction="0,0,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="10000,10,10000" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="10000,10,10000" />
-      </collisionShapes>
-  </StaticEntity>
-
-  <Pawn health=100 position="530,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-
-  <Pawn health=100 position="670,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-
-   <Pawn health=100 position="600,70,1500" direction="0,0,-1" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-
-   <Pawn health=100 position="600,150,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="90,80,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="90,80,10" />
-      </collisionShapes>
-  </Pawn>
-
-  <Pawn health=100 position="600,35,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-
-
-  <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
-
-
-<?lua
-for i = 1, 100, 1
-do
-j = math.random()
-g = math.random()
-h = math.random()
-?>
-  <Pawn position="<?lua print( (math.random()+10) * 1000 - 9800) ?>,<?lua print(math.random()) ?>,<?lua print( (math.random()+10) * 2000 - 19500) ?>" direction="<?lua print( (math.random()+10) * 10 - 100) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100)?> >
-      <attached>
-        <Model position="0,0,0" scale3D="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" mesh="cube<?lua
-        if math.mod(i,4)==0 then print('_green') end
-        if math.mod(i,4)==1 then print('_red') end
-        if math.mod(i,4)==2 then print('_orange') end
-        ?>.mesh" /> <!--if it's 3, cube.mesh is taken -> yellow -->
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" />
-      </collisionShapes>
-  </Pawn>
-<?lua
-end
-?>
-
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationFS11.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationFS11.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationFS11.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,476 +0,0 @@
-<LevelInfo
- name = "Presentation FS11"
- description = "Presentation level spring semester '11"
- tags = "presentation"
- screenshot = "presentationfs11.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<?lua
-include("templates/pickupRepresentationTemplates.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <NotificationQueueCEGUI
-    name="narrative"
-    targets="simpleNotification"
-    size=1
-    displayTime=30
-    position="0.2, 0, 0.1, 0"
-    fontSize="24"
-    fontColor="0.3, 1, 0.2, 0.8"
-    alignment="HorzCentred"
-    displaySize="0.6, 0, 0, 0"
-    />
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyboxempty"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
-    <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"/>
-
-    <!-- SOUND -->
-    <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
-    <WorldAmbientSound source="Mars.ogg" looping="true">
-        <events>
-            <activity>
-                <DistanceTrigger position="-72369,803,2" distance=1700 target="Camera" />
-            </activity>
-        </events>
-    </WorldAmbientSound>
-    <WorldAmbientSound source="Jupiter.ogg" looping="true">
-        <events>
-            <activity>
-                <DistanceTrigger position="-73450,5067,-351" distance=800 target="Camera" />
-            </activity>
-        </events>
-    </WorldAmbientSound>
-
-    <!-- EARTH ORBIT -->
-
-    <DistanceTrigger name="spawntrigger" position="0,0,0" target="Pawn" distance=10 stayActive="true" />
-    <DistanceTrigger name="spawndelaytrigger1" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=1 />
-    <DistanceTrigger name="spawndelaytrigger2" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=7 />
-    <DistanceTrigger name="spawndelaytrigger3" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=12 />
-    <DistanceTrigger name="spawndelaytrigger4" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=15 />
-    <DistanceTrigger name="spawndelaytrigger5" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=25 />
-    <DistanceTrigger name="spawndelaytrigger6" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=35 />
-    <DistanceTrigger name="spawndelaytrigger7" position="0,0,0" target="Pawn" distance=10 stayActive="true" delay=40 />
-
-    <SpawnPoint position="0,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff>
-        <events>
-            <activity>
-                <EventTrigger invert="true">
-                    <events>
-                        <trigger>
-                            <EventListener event="spawndelaytrigger1" />
-                        </trigger>
-                    </events>
-                </EventTrigger>
-            </activity>
-        </events>
-    </SpawnPoint>
-
-    <SimpleNotification message="Welcome to Earth Orbit" >
-        <events>
-            <trigger>
-                <EventListener event=spawntrigger />
-            </trigger>
-        </events>
-    </SimpleNotification>
-    <SimpleNotification message="Turn right to witness an explosion" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger1 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <!-- EARTH -->
-    <Planet
-      position="80500,0,0"
-      scale="63000"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="5.9e21"
-      pitch="-90"
-      yaw="50"
-      mesh="planets/earth.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="0,1,0"
-      rotationrate="0.2"
-      atmospheresize="80.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="63000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-
-    <!-- PARTICLE EFFECT -->
-
-    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp" autostart="false" lifetime=500 loop=1 startdelay=2.5>
-        <events>
-            <spawn>
-                <EventListener event=spawndelaytrigger1 />
-            </spawn>
-        </events>
-    </ParticleSpawner>
-    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp2" autostart="false" lifetime=500 loop=1 startdelay=2>
-        <events>
-            <spawn>
-                <EventListener event=spawndelaytrigger1 />
-            </spawn>
-        </events>
-    </ParticleSpawner>
-    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp3" autostart="false" lifetime=500 loop=1 startdelay=2>
-        <events>
-            <spawn>
-                <EventListener event=spawndelaytrigger1 />
-            </spawn>
-        </events>
-    </ParticleSpawner>
-    <StaticEntity collisionType = "static" position = "-50,50,-125" scale=1 >
-      <attached>
-        <Model position="0,0,0" scale="2" mesh="ast1.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="8" />
-      </collisionShapes>
-    </StaticEntity>
-       
-    <SimpleNotification message="A particle effect by Tibor" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger2 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <!-- ENEMIES 1st ROUND -->
-
-    <SimpleNotification message="Enemies attacking" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger3 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <Script code="addBots 3" onLoad="false">
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger3 />
-            </trigger>
-        </events>
-    </Script>
-
-    <SpawnPoint position="100,0,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-        <events>
-            <activity>
-                <EventListener event=spawnpointtrigger />
-            </activity>
-        </events>
-    </SpawnPoint>
-
-    <SpawnPoint position="0,-100,0" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-        <events>
-            <activity>
-                <EventListener event=spawnpointtrigger />
-            </activity>
-        </events>
-    </SpawnPoint>
-
-    <SpawnPoint position="0,0,100" lookat="-2,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff active="false" >
-        <events>
-            <activity>
-                <EventListener event=spawnpointtrigger />
-            </activity>
-        </events>
-    </SpawnPoint>
-
-    <Trigger name="spawnpointtrigger" mode="xor" invert="true" >
-        <EventTrigger>
-            <events>
-                <trigger>
-                    <EventListener event=spawndelaytrigger1 />
-                </trigger>
-            </events>
-        </EventTrigger>
-        <EventTrigger invert="true">
-            <events>
-                <trigger>
-                    <EventListener event=portaltrigger />
-                </trigger>
-            </events>
-        </EventTrigger>
-    </Trigger>
-
-    <!-- SPACE BOUNDARY -->
-
-    <SpaceBoundaries warnDistance="1" maxDistance="400" showDistance="300" healthDecrease="0.1" position="-90000,0,0"/>
-    <SpaceBoundaries warnDistance="1" maxDistance="400" showDistance="300" healthDecrease="0.1" position="0,10000,0"/>
-    <SpaceBoundaries warnDistance="1" maxDistance="450" showDistance="300" healthDecrease="0.1" position="0,0,0"/>
-    <SpaceBoundaries warnDistance="1" maxDistance="400" showDistance="300" healthDecrease="0.1" position="-30000,0,0"/>
-
-    <SimpleNotification message="Notice the shields by Simon" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger4 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="and space boundaries by Maurus" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger5 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Let's get out of here" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger6 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <Script code="killBots" onLoad="false">
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger6 />
-            </trigger>
-        </events>
-    </Script>
-
-    <SimpleNotification message="Boost enhancement by Dominik" >
-        <events>
-            <trigger>
-                <EventListener event=spawndelaytrigger7 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-    
-    <!-- PORTALS -->
-
-    <Template name=PortalDefault>
-        <PortalEndPoint>
-            <attached>
-                <Billboard material="Portals/Default" />
-            </attached>
-        </PortalEndPoint>
-    </Template>
-
-    <PortalEndPoint position="-350,0,0" id="3" distance="40" target="MobileEntity" design="PortalDefault" active="false">
-        <events>
-            <activity>
-                <EventListener event=spawndelaytrigger6 />
-            </activity>
-        </events>
-    </PortalEndPoint>
-    <PortalEndPoint position="-72000,0,0" id="4" distance="40" target="MobileEntity" design="PortalDefault" />
-    <PortalLink fromID="3" toID="4" />
-    <PortalLink fromID="4" toID="3" />
-
-    <DistanceTrigger name="portaltrigger" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" />
-    <DistanceTrigger name="portaldelaytrigger1" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=5 />
-    <DistanceTrigger name="portaldelaytrigger2" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=10 />
-    <DistanceTrigger name="portaldelaytrigger3" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=15 />
-    <DistanceTrigger name="portaldelaytrigger4" position="-72000,0,0" target="Pawn" distance=10 stayActive="true" delay=17 />
-
-    <SimpleNotification message="Welcome to Moon Orbit" >
-        <events>
-            <trigger>
-                <EventListener event=portaltrigger />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Portals by Andreas" >
-        <events>
-            <trigger>
-                <EventListener event=portaldelaytrigger1 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <!-- MOON AREA -->
-    
-    <!-- MOON -->
-    <Planet
-      position="-80000,0,0"
-      scale="4000"
-      collisionType="dynamic"
-      linearDamping="0.8"
-      angularDamping="0"
-      mass="7.36e19"
-      pitch="0"
-      mesh="planets/moon.mesh"
-      atmosphere="atmosphere1"
-      rotationaxis="0,1,0"
-      rotationrate="0.2"
-      atmospheresize="0.0f"
-      imagesize="1024.0f"
-      collisiondamage = 2
-      enablecollisiondamage = true
-    >
-      <attached>
-        <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="4000" position="0,0,0" />
-      </collisionShapes>
-    </Planet>
-
-    <SimpleNotification message="Hydrogen farmer/space station by Hans" >
-        <events>
-            <trigger>
-                <EventListener event=portaldelaytrigger2 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <!-- HYDROGEN FARMER & DOCKING -->
-    <SpaceShip position="-74000,2500,0" roll=90 yaw=180 pitch=20 mass=10000 health=100000 >
-      <attached>
-        <!-- Docking -->
-        <DistanceTriggerBeacon name="bcnDestroyer" />
-        <DockingTarget name="destroyer" />
-
-        <Model mesh="HydroHarvester.mesh" mass=10 position="0,0,0" scale=100 />
-        <!-- <Model mesh="cube.mesh" mass=10 position="-1120,0,0" scale3D="230,200,490"  /> -->
-        <!-- <Model mesh="cube.mesh" mass=10 position="580,0,-960" scale3D="230,200,490" yaw=-120 /> -->
-        <!-- <Model mesh="cube.mesh" mass=10 position="580,0,960" scale3D="230,200,490" yaw=-240 /> -->
-        <!-- <Model mesh="cube.mesh" mass=10 position="0,0,0" scale3D="600,200,100" /> -->
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape  position="-1120,0,0" halfExtents="230,200,490" />
-        <BoxCollisionShape  position="580,0,-960" halfExtents="230,200,490" yaw=-120 />
-        <BoxCollisionShape  position="580,0,960" halfExtents="230,200,490" yaw=-240 />
-      </collisionShapes>
-    </SpaceShip>
-
-    <Dock position="-73942, 1288, -255" roll=90 yaw=180 >
-        <animations>
-            <MoveToDockingTarget target="destroyer" />
-        </animations>
-        <effects>
-            <DockToShip target="spaceShip" />
-        </effects>
-        <events>
-            <execute>
-                <EventListener event="dockMe" />
-            </execute>
-        </events>
-        <attached>
-            <DistanceTrigger position="10,-202, -42" distance="800" target="Pawn"
-                beaconMode="exclude" targetname="bcnDestroyer" name="dockMe"
-            />
-        </attached>
-    </Dock>
-
-    <SpaceShip template="spaceshipassff2" position="-73915,3786,67" orientation="-0.14045, 0.68254, 0.68144, 0.223774" >
-      <attached>
-        <DockingTarget name="spaceShip" />
-      </attached>
-    </SpaceShip>
-
-    <!-- PICKUPS -->
-    <SimpleNotification message="Oh, what have we here?" >
-        <events>
-            <trigger>
-                <EventListener event=portaldelaytrigger3 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Shrink pickup by Sandro" >
-        <events>
-            <trigger>
-                <EventListener event=portaldelaytrigger4 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <PickupSpawner pickup="smallshrinkpickup" position="-72487,420,-63" respawnTime="10" triggerDistance="20" maxSpawnedItems="5" active="false">
-      <events>
-        <activity>
-            <EventListener event=portaldelaytrigger3 />
-        </activity>
-      </events>
-      <attached>
-        <ParticleSpawner position="0,0,0" source="Orxonox/Shield" autostart="false" lifetime=500 loop=0 >
-            <events>
-                <spawn>
-                    <EventListener event=portaldelaytrigger3 />
-                </spawn>
-            </events>
-        </ParticleSpawner>
-      </attached>
-    </PickupSpawner>
-
-    <SpaceBoundaries warnDistance="1" maxDistance="1700" showDistance="500" healthDecrease="0.1" position="-72369,803,2"/>
-    <SpaceBoundaries warnDistance="1" maxDistance="800" showDistance="300" healthDecrease="0.1" position="-73450,5067,-351"/>
-
-    <!-- FINISH -->
-
-    <DistanceTrigger name="dockingtrigger" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" />
-    <DistanceTrigger name="dockingdelaytrigger1" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" delay=3 />
-    <DistanceTrigger name="dockingdelaytrigger2" position="-73942, 1288, -255" target="Pawn" distance=20 stayActive="true" delay=10 />
-
-    <SimpleNotification message="Docking by Sven" >
-        <events>
-            <trigger>
-                <EventListener event=dockingtrigger />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Weapons by Jonas" >
-        <events>
-            <trigger>
-                <EventListener event=dockingdelaytrigger1 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Steering enhancement by Manuel" >
-        <events>
-            <trigger>
-                <EventListener event=dockingdelaytrigger2 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-    
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/presentationHS09.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationHS09.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationHS09.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,401 +0,0 @@
-<LevelInfo
- name = "Presentation X 1st"
- description = "1st Presentation level for Orxonox Convention X"
- tags = "presentation"
- screenshot = "presentationx1st.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/pickupRepresentationTemplates.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level
- gametype = "TeamDeathmatch"
- hasPhysics = true
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.6, 0.4, 0.4"
-   skybox       = "Orxonox/skyBoxSomeNebula"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
-    <Light type=directional position="0,0,0" direction="0.683, 0.289, 0.670" diffuse="0.8, 0.5, 0.5, 1.0" specular="0.8, 0.4, 0.4, 1.0" />
-
-    <SpawnPoint position="-3800, 2500, 1500" direction="-0.683, -0.289, -0.670"  spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <SpaceShip position="-3900,3000,1000">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4100,2600,1600">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4000,2500,1500">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0>
-          <waypoints>
-            <StaticEntity position="-3850,2800,1450" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4100,2700,1500">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0 />
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="-4150,2750,1550">
-      <templates>
-        <Template link=spaceshipHtwo/>
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=100 team=0 />
-      </controller>
-    </SpaceShip>
-
-    <Billboard material="Test/Fog" position="-3800, 2500, 1500" alpha="0.1" color="1, 1, 1, 0.1" scale="0.5" />
-
-    <PickupSpawner pickup=smalljumppickup position="-3800, 2500, 1500" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-    <!-- PickupRepresentation for the pickup below, since it is not a standard pickup provided by pickups.oxi -->
-    <PickupRepresentation
-      name = "MediumHealth"
-      pickupName = "Medium Health Pack"
-      pickupDescription = "Once used adds a medium amout of health to the ship."
-      spawnerTemplate = "mediumhealthpickupRepresentation"
-      inventoryRepresentation = "MediumHealth"
-    />
-
-    <Template name=onusehealthpickup baseclass=HealthPickup>
-      <HealthPickup representation="MediumHealth" health=100 activationType=onUse durationType=once />
-    </Template>
-
-    <PickupSpawner pickup=onusehealthpickup position="-4150,2750,1550" respawnTime="60" triggerDistance="20" maxSpawnedItems="5" />
-
-    <PickupSpawner pickup=mediumhealthpickup position="2300, 4300, 2400" respawnTime="5" triggerDistance="20" />
-
-    <Billboard position="-2500, 2400, 1500" material="Examples/Flare" />
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=pirates />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="-2500, 2400, 1500" distance=250 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <SpaceShip position="<?lua print(5000 + math.random() * 4000 - 2000) ?>,<?lua print(0 + math.random() * 2000 - 1000) ?>,<?lua print(math.random() * 2000 - 1000) ?>">
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <WaypointPatrolController name=pirates alertnessradius=1000 team=1 active=false>
-            <waypoints>
-              <StaticEntity position="3100, 2000, 1500" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <?lua
-      for i = 1, 12, 1 do
-    ?>
-      <SpaceShip position="<?lua print(2800 + math.random() * 2000 - 1000) ?>,<?lua print(2500+ math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>" >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=0>
-            <waypoints>
-              <StaticEntity position="<?lua print(2800 + math.random() * 1000 - 500) ?>,<?lua print(2500 + math.random() * 1000 - 500) ?>,<?lua print(1500 + math.random() * 1000 - 500) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <Billboard position="2300, 4400, 2500" material="Examples/Flare" />
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=attacker />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="2300, 4400, 2500" distance=50 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <?lua
-      for i = 1, 12, 1 do
-    ?>
-      <SpaceShip position="<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(4800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>" >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController name=attacker alertnessradius="<?lua print(math.random() * 2000) ?>" team=0 active=false>
-            <waypoints>
-              <StaticEntity position="<?lua print(2800 + math.random() * 500 - 250) ?>,<?lua print(2500 + math.random() * 500 - 250) ?>,<?lua print(1500 + math.random() * 500 - 250) ?>" />
-              <StaticEntity position="<?lua print(5000 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>,<?lua print(0 + math.random() * 500 - 250) ?>" />
-              <StaticEntity position="<?lua print(7500 + math.random() * 500 - 250) ?>,<?lua print(-2500 + math.random() * 500 - 250) ?>,<?lua print(-1500 + math.random() * 500 - 250) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <StaticEntity position="2800, 2500, 2500">
-      <attached>
-        <CheckPoint />
-        <Model position="400, 0, 0" scale="40" mesh="DuBall2.mesh"/>
-        <Model position="-400, 0, 0" scale="40" mesh="DuBall1.mesh"/>
-      </attached>
-    </StaticEntity>
-
-<!--
-    <Destroyer position="6500, -2000, -1000" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=500>
-      <attached>
-        <CheckPoint />
-        <Model position="0,0,0" scale="5" mesh="Carrier.mesh"/>
-        <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"
-        />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
--->
-
-    <Destroyer
-      position          = "6500,-2000,-1000"
-      collisionType     = dynamic
-      mass              = 100000
-      angularDamping    = 0.9999999
-      health            = 1000
-      maxhealth         = 1000
-      initialhealth     = 1000
-    >
-      <controller>
-        <WaypointPatrolController team=1 />
-      </controller>
-      <attached>
-        <Model mesh="Carrier.mesh" scale="5" />
-        <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"
-        />
-
-        <?lua
-          for i=0,8,1 do
-        ?>
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?> ,15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?>,-15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-        <?lua end ?>
-
-        <Backlight
-          scale=1
-          position=" 169, 75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-        <Backlight
-          scale=1
-          position=" 169, -75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <SpaceShip position="<?lua print(6200 + math.random() * 2000 - 1000) ?>,<?lua print(-1500 + math.random() * 1000 - 500) ?>,<?lua print(-700 + math.random() * 1000 - 500) ?>" >
-        <templates>
-          <Template link=spaceshippirate />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=1>
-            <waypoints>
-              <StaticEntity position="<?lua print(6000 + math.random() * 1000 - 500) ?>,<?lua print(-2000 + math.random() * 1000 - 500) ?>,<?lua print(-1000 + math.random() * 1000 - 500) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <?lua
-      elements = {"asteroid_ice.mesh", "asteroid_UV.mesh", "ast1.mesh", "ast2.mesh", "ast3.mesh", "ast4.mesh", "ast5.mesh", "ast6.mesh"}
-
-      elements.length = function()
-        return table.getn(elements)
-      end
-
-      for i = 1, 100, 1 do
-        x = math.random() * 100  + (i) * 100
-        y = math.random() * 3000 - 1500
-        z = math.random() * 3000 - 1500 + (i-100) * 10
-        s = math.random() * 60 + 30
-        e = math.floor(math.random()*elements.length()+1)
-    ?>
-      <MovableEntity mass=90000 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() * 100 - 15) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="<?lua print(elements[e])?>" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-    <?lua
-      for i = 1, 100, 1 do
-        x = math.random() * 200 + i*200
-        y = math.random() * 3000 - 1500
-        z = math.random() * 3000 - 1500 + (i-100) * 10
-        s = math.random() * 60 + 30
-    ?>
-      <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
-      <!-- Billboard material="Test/Fog" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>"  color="1, 1, 1, 0.01" scale="20" /-->
-    <?lua end ?>
-
-    <?lua
-      elements = {"BodyDebris1.mesh", "CockpitDebris.mesh", "LightningGun.mesh", "WingDebris1.mesh", "WingDebris2.mesh", "satellitedish.mesh", "Thruster.mesh"}
-      sizes = {4, 4, 4, 4, 4, 10, 20}
-      
-      elements.length = function()
-        return table.getn(elements)
-      end
-      
-      for i = 1, 150, 1 do
-        x = math.random() * 750 - 4500
-        y = math.random() * 1000 + 2000
-        z = math.random() * 500 + 1000
-        e = math.floor(math.random()*elements.length()+1)
-    ?>
-      <MovableEntity mass=90000 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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-    
-<!--
-    <Planet position="1000,0,0" mass=900000 scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
--->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationHS09b.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationHS09b.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationHS09b.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,269 +0,0 @@
-<LevelInfo
- name = "Presentation X 2nd"
- description = "2nd Presentation level for Orxonox Convention X"
- tags = "presentation"
- screenshot = "presentationx2nd.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipGhost.oxt")
-  include("templates/spaceshipHXY.oxt")
-  include("templates/spaceshipTransporter.oxt")
-  include("templates/spaceshipHXYSL.oxt")
-  include("templates/spaceshipTransporterSL.oxt")
-?>
-
-<Level
- gametype = "TeamDeathmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <WorldAmbientSound source="Mars.ogg" looping="true" playOnLoad="true" />
-
-   <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" />
-   
-    <?lua
-      for i = 1, 50, 1 do
-        x = math.random() * 2000  + 4000
-        y = math.random() * 4000 - 2000
-        z = math.random() * 2000 - 1000
-        s = math.random() * 100
-    ?>
-      <MovableEntity collisiontype=dynamic mass="<?lua print(s*10)?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="asteroid_UV.mesh" />
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(s*0.9) ?>" />
-        </collisionShapes>
-      </MovableEntity>
-      <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
-    <?lua end ?>
-
-    <?lua
-      elements = {"BodyDebris1.mesh", "CockpitDebris.mesh", "LightningGun.mesh", "WingDebris1.mesh", "WingDebris2.mesh", "satellitedish.mesh", "Thruster.mesh"}
-      sizes = {4, 4, 4, 4, 4, 10, 20}
-      
-      elements.length = function()
-        return table.getn(elements)
-      end
-      
-      for i = 1, 100, 1 do
-        x = math.random() * 750 - 4500
-        y = math.random() * 1000 + 2000
-        z = math.random() * 500 + 1000
-        e = math.floor(math.random()*elements.length()+1)
-    ?>
-      <MovableEntity mass=90000 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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-    <?lua
-      for i = 1,12, 1 do
-    ?>
-      <SpaceShip position="<?lua print(math.random()*500 + 4500) ?>,<?lua print(-(math.random()*500 -250)) ?>,<?lua print(i*50 - 150) ?>" >
-        <templates>
-          <Template link=spaceshipHXYSL />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=4000 team=0 active=true>
-            <waypoints>
-              <StaticEntity position="5000,<?lua print(math.random()*50)?> ,<?lua print(i*50 -150) ?>" />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <SpaceShip position="5000,100,100" >
-      <templates>
-        <Template link=spaceshipTransporterSL />
-      </templates>
-      <controller>
-        <WaypointPatrolController name=pirate  target=pirate alertnessradius=1000 team=0 active=false>
-          <waypoints>
-            <StaticEntity position="5000,100,1100" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <Destroyer
-      position          = "-5000,100 ,100"
-      collisionType     = dynamic
-      mass              = 100000
-      angularDamping    = 0.9999999
-      health            = 1000
-      maxhealth         = 1000
-      initialhealth     = 1000
-    >
-      <controller>
-        <WaypointPatrolController team=1 />
-      </controller>
-      <attached>
-        <Model mesh="Carrier.mesh" scale="5" />
-        <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"
-        />
-        <?lua
-          for i=0,8,1 do
-        ?>
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?> ,15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?>,-15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-        <?lua end ?>
-
-        <Backlight
-          scale=1
-          position=" 169, 75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-        <Backlight
-          scale=1
-          position=" 169, -75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
-
-    <?lua
-      for i = 1, 50, 1 do
-        x = -(math.random() * 2000  + 4000)
-        y = math.random() * 4000 - 2000
-        z = math.random() * 2000 - 1000
-        s = math.random() * 100
-    ?>
-      <MovableEntity collisiontype=dynamic mass="<?lua print(s*10)?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" linearDamping=0.01 angularDamping=0 rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 100 - 15) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(s) ?>" mesh="asteroid_ice.mesh" />
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(s*0.9)?>" />
-        </collisionShapes>
-      </MovableEntity>
-      <ParticleSpawner position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" source="Orxonox/Steam" lifetime=3.0 loop=1 />
-    <?lua end ?>
-
-    <!-- EventDispatcher>
-      <targets>
-        <EventTarget target=attack />
-        <EventTarget target=wait />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="0, 0, 4500" distance=100 target="SpaceShip" stayactive=true />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-    <EventDispatcher>
-      <targets>
-        <EventTarget target=wait />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="0, 0, 4500" distance=100 target="SpaceShip" stayactive=false />
-        </activity>
-      </events>
-    </EventDispatcher -->
-
-    <?lua
-      for i = 1,25, 1 do
-    ?>
-      <SpaceShip position="<?lua print(-(math.random()*500 + 4500)) ?>,<?lua print(-(math.random()*500 -250)) ?>,<?lua print(i*50 - 150) ?>" >
-        <templates>
-          <Template link=spaceshipghost />
-        </templates>
-        <controller>
-          <WaypointPatrolController name=attack alertnessradius=15000 team=1 active=false>
-            <events>
-              <activity>
-                <DistanceTrigger position="-5000, 100, 100" distance=2000 target="Camera" stayactive=true />
-              </activity>
-            </events>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="false">
-      <events>
-        <activity>
-          <DistanceTrigger position="2000,0,0" distance=500 target="Camera" />
-        </activity>
-      </events>
-    </WorldAmbientSound>
-
-    <SpawnPoint position="5000,0,2000" spawnclass=SpaceShip pawndesign=spaceshipassff  team=0 />
-    
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/presentationHS11.oxw
===================================================================
--- code/branches/release2012/data/levels/presentationHS11.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/presentationHS11.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,245 +0,0 @@
-<!--  -->
-
-
-<LevelInfo
- name = "Presentation HS 2011"
- description = "New Features: Asteroid field/belt generator; Formationflight; HUD (Enemyhealthbar, displaying Names)"
- tags = "presentation"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipSwallow.oxt")
-  include("templates/spaceshipTransporter.oxt")
-?>
-
-<Level
- gametype = "Mission"
->                      <!--ALTERNATIVE: TeamGametype-->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <NotificationQueueCEGUI
-    name="narrative"
-    targets="simpleNotification"
-    size=3
-    displayTime=3.9
-    position="0.2, 0, 0.1, 0"
-    fontSize="23"
-    fontColor="0.3, 1, 0.2, 0.8"
-    alignment="HorzCentred"
-    displaySize="0.6, 0, 0, 0"
-    />
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skyBoxMoreNebula"
-  >
-
-  <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"/>
-
-  <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow/>
-
-  <!-- TRIGGERS -->
-    <DistanceTrigger name="FormationInit" position="800,700,600"  target="Pawn" distance=60 stayActive="true" delay=0.1 />
-    <DistanceTrigger name="LetsGo"        position="200,-200,1000" target="Pawn" distance=180 stayActive="true" delay=0.1 />
-      <BlinkingBillboard colour="1,1,0.05"position="200,-200,1000" frequency=0.6 amplitude=3 material="Flares/lensflare" >
-      </BlinkingBillboard>
-
-
-
-
-    <Script code="formationcontroller formationflight true" onLoad="false">
-        <events>
-            <trigger>
-                <EventListener event=FormationInit />
-            </trigger>
-        </events>
-    </Script> <!-- !!! activates formation behaviour !!! -->
-
-    <Script code="artificialcontroller setbotlevel 0.1" onLoad="false">
-        <events>
-            <trigger>
-                <EventListener event=FormationInit />
-            </trigger>
-        </events>
-    </Script> <!-- make bots "friendly", doesn't work yet :-( -->
-
-    <SimpleNotification message="Let's go!">
-        <events>
-            <trigger>
-                <EventListener event="LetsGo" />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-
-
-
-<!-- ADDING FORMATION: 5 Swallows -->
-<?lua for i=0,4,1 do
-?>
-    <SpaceShip position="<?lua print(400+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
-        <!--events>
-            <visibility>
-                <EventListener event="ondock" />
-            </visibility>
-        </events-->
-        <templates>
-            <Template link=spaceshipswallow /> <!--spaceshipTransporter spaceshippirate-->
-        </templates>
-        <controller>
-            <AIController team=0>
-                <events>
-                    <activity>
-                        <EventListener event="LetsGo" />
-                     </activity>
-                </events>
-            </AIController>
-        </controller>
-    </SpaceShip>
-<?lua end ?>
-
-<?lua for i=0,2,1 do
-?>
-
-
-<!-- ENEMY TRANSPORTER -->
-    <SpaceShip position="<?lua print(-400+i*200) ?>,3000,-2000" lookat="-1300,-600,900" visible="true">
-        <!--events>
-            <visibility>
-                <EventListener event="LetsGo" />
-            </visibility>
-        </events-->
-        <templates>
-            <Template link=spaceshipTransporter />
-        </templates>
-        <controller>
-            <AIController team=1>
-                <events>
-                    <activity>
-                        <EventListener event="LetsGo" />
-                     </activity>
-                </events>
-            </AIController>
-        </controller>
-    </SpaceShip>
-<?lua end ?>
-
-<!-- @Triggers: "hintX" <->  delayed LetsGo -->
-    <EventTrigger name="hint1" activations="1" stayactive="true" delay=4.2>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-    <EventTrigger name="hint2" activations="1" stayactive="true" delay=8.4>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-    <EventTrigger name="hint3" activations="1" stayactive="true" delay=12.6>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-    <EventTrigger name="hint4" activations="1" stayactive="true" delay=16.8>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-    <EventTrigger name="hint5" activations="1" stayactive="true" delay=21>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-    <EventTrigger name="hint6" activations="1" stayactive="true" delay=25.2>
-      <events>
-        <trigger>
-          <EventListener event="LetsGo" />
-        </trigger>
-      </events>
-    </EventTrigger>
-
-
-
-    <SimpleNotification message="Make bots follow you: Press (1)"  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint1 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Toggle group behaviour: Press (1)"  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint2 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Tell the bots to defend you: Press (2)"  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint3 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Make them attack opponents: Press (2) again"  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint4 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Let the bots behave 'normal': Press (2) again"  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint5 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-    <SimpleNotification message="Have a look at the console to verify this."  broadcast="true">
-        <events>
-            <trigger>
-                <EventListener event=hint6 />
-            </trigger>
-        </events>
-    </SimpleNotification>
-
-<!-- Generate asteroid field and asteroid belt -->
-<!-- asteroidBelt(centerX, centerY, centerZ, yaw, pitch, segments, minSize, maxSize, radius0, radius1, count, fog) -->
-    <?lua
-        dofile("includes/asteroidField.lua")
-        asteroidBelt(20000, 0, 13000, -48, -34, 70, 100, 200, 22000, 20000, 500, 1)
-
-    ?>
-
-
-
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/princessAeryn.oxw
===================================================================
--- code/branches/release2012/data/levels/princessAeryn.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/princessAeryn.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,277 +0,0 @@
-<LevelInfo
- name = "The Tale of Princess Aeryn"
- description = "The Tale of the elusive but beautiful Princess Aeryn"
- tags = "mission"
- screenshot = "thetaleofprincessaeryn.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  dofile("includes/CuboidSpaceStation.lua")
-?>
-
-<Level>
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.3, 0.3, 0.3"
-    skybox     = "Orxonox/skyBoxBasic"
-  >
-
-    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-    <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" />
-
-    <!-- Quest: -->
-    <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
-      <QuestDescription title="The Tale of Princess Aeryn" description="Princess Aeryn has been kidnapped by evil Mr. M and you were just a little too late to save her.\nYou have to find and save her from her captors." failMessage="You cannot fail, how did you?" completeMessage="You did it John. You're a hero. Princess Aeryn however will still not marry you." />
-      <subquests>
-        <GlobalQuest id="43766602-7e2f-4d24-976a-3f9de1474d5b">
-          <QuestDescription title="Find Aeryn's S.H.O.E.S." description="Oh, the kidnappers must have been in a hurry because they overlooked princess Aeryns S.H.O.E.S. (Super Heavily Organized Escape Ship) hidden in the asteroid field over there.\nFind it and look there for clues to Princess Aeryns whereabouts." completeMessage="You did it, Looking through her stuff you find an odd looking device - Could this be the receiver of Princess Aeryns locator beacon? - But it must be broken, the screen remains blank." />
-          <complete-effects>
-            <AddQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-          </complete-effects>
-        </GlobalQuest>
-        <GlobalQuest id="50845552-c8af-4091-947c-76bd850b224e">
-          <QuestDescription title="Repair the receiver." description="There is a space station called 'Serenity Station' near here. An engineer called Nathan Stark who shoud be able to help you lives there." completeMessage="'Yeah Nathan lives here, he'll shurely help you.'\nAnd he does, apparenty the device was just low on batteries so you're now able to locate your beloved Princess Aeryn." />
-          <hints>
-            <QuestHint id="b9b10841-b045-4797-b1d3-cfce760e1de6">
-              <QuestDescription title="The Katratzi Station" description="'We ain't buying!'\n'What do you want?'\n'No there lives no Nathan here.'\n'Fuck off.''" />
-            </QuestHint>
-            <QuestHint id="1ee785f8-b71d-4b51-b080-42cec5be8e3c">
-              <QuestDescription title="The Pegasus Station" description="'Hello friend.'\n'How can we help you?'\n'A Mr. Stark you say? Sorry no man with such a name lives here.'" />
-            </QuestHint>
-          </hints>
-          <complete-effects>
-            <AddQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-          </complete-effects>
-        </GlobalQuest>
-        <GlobalQuest id="97628524-b243-492c-b7b6-498f325b21d4">
-          <QuestDescription title="Follow the dots" description="Just follow the dots, they'll lead you right to her." completeMessage="You found Princess Aeryn. Her captors give up at the shere sight ou you." />
-          <complete-effects>
-            <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-          </complete-effects>
-        </GlobalQuest>
-      </subquests>
-    </GlobalQuest>
-
-    <!-- Create spaceship spawner: -->
-    <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-      <spawn>
-        <EventTrigger delay=1>
-        <events>
-          <trigger>
-          <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-          </trigger>
-        </events>
-        </EventTrigger>
-      </spawn>
-      </events>
-      <attached>
-      <QuestEffectBeacon position="0,0,0" times=1>
-        <effects>
-          <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-          <AddQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-        </effects>
-        <events>
-          <execute>
-            <EventListener event=questbeacon1 />
-          </execute>
-        </events>
-        <attached>
-          <DistanceTrigger name=questbeacon1 position="0,0,0" distance=10 target="Pawn" />
-        </attached>
-      </QuestEffectBeacon>
-      </attached>
-    </ParticleSpawner>
-
-    <!-- Create world -->
-
-      <!-- Kidnapper flying away -->
-      <MovableEntity position="200,0,0" velocity="-140,0,-140" yaw=45>
-        <attached>
-          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" />
-          <ParticleSpawner position="0,0,10" source="Orxonox/fire3" lifetime=2.0 loop=0 autostart=1 />
-          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-            <effects>
-              <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon7 />
-              </execute>
-            </events>
-            <attached>
-              <DistanceTrigger name=questbeacon7 position="0,0,0" distance=10 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </MovableEntity>
-
-      <!-- Asteroid field -->
-      <StaticEntity position="-500,0,-3000">
-        <attached>
-          <?lua
-            for i = 1, 200 do
-          ?>
-            <MovableEntity position="<?lua print(math.random() * 2000 - 1000)?>, <?lua print(math.random() * 2000 - 1000) ?>, <?lua print(math.random() * 2000 - 1000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-              <attached>
-                <Model scale="<?lua print(math.random() * 50) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-              </attached>
-            </MovableEntity>
-          <?lua end ?>
-          <!-- S.H.O.E.S -->
-          <StaticEntity position="-300,0,0">
-            <attached>
-              <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="assff.mesh" />
-              <QuestEffectBeacon position="0,0,0" times=-1>
-                <effects>
-                  <CompleteQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-                </effects>
-                <events>
-                  <execute>
-                    <EventListener event=questbeacon2 />
-                  </execute>
-                </events>
-                <attached>
-                  <DistanceTrigger name=questbeacon2 position="0,0,0" distance=50 target="Pawn" />
-                </attached>
-              </QuestEffectBeacon>
-            </attached>
-          </StaticEntity>
-        </attached>
-      </StaticEntity>
-
-
-
-      <!-- Spacestations -->
-
-      <!-- Serenity Station -->
-      <StaticEntity scale=1 position="0,0,5000" yaw=30>
-        <attached>
-          <?lua
-            createSpaceStationPar(65461,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="0,450,0" times=1>
-            <effects>
-              <CompleteQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon3 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon3 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Katratzi Station -->
-      <StaticEntity scale=1 position="0,5000,300" yaw=60>
-        <attached>
-          <?lua
-            createSpaceStationPar(9851,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="0,450,0" times=1>
-            <effects>
-              <AddQuestHint hintId="b9b10841-b045-4797-b1d3-cfce760e1de6" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon4 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon4 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Pegasus Station -->
-      <StaticEntity scale=1 position="-5000,100,1000" roll=30>
-        <attached>
-          <?lua
-            createSpaceStationPar(3574,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="200,450,0" times=1>
-            <effects>
-              <AddQuestHint hintId="1ee785f8-b71d-4b51-b080-42cec5be8e3c" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon5 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon5 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Trail -->
-      <EventDispatcher>
-        <targets>
-          <EventTarget target=trail />
-        </targets>
-        <events>
-          <visibility>
-            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-          </visibility>
-          <activity>
-            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-          </activity>
-        </events>
-      </EventDispatcher>
-
-      <?lua
-        for i = 1, 25 do
-      ?>
-        <Billboard position="<?lua print(i*5000/25) ?>,<?lua print(450+i*(5000-450)/25) ?>,5000" colour="1.0,0,0" material="Examples/Flare" name=trail visible=false/>
-      <?lua end ?>
-
-      <!-- Hideout -->
-      <StaticEntity position="5000,5000,5000" >
-        <attached>
-          <Model scale="100" mesh="ast2.mesh" shadow=false />
-        </attached>
-      </StaticEntity>
-
-      <StaticEntity position="5400,5400,5000" visible=false name=trail >
-        <attached>
-          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" visible=false name=trail />
-          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-            <effects>
-              <CompleteQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon6 />
-              </execute>
-            </events>
-            <attached>
-              <DistanceTrigger name=questbeacon6 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/quests.oxw
===================================================================
--- code/branches/release2012/data/levels/quests.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/quests.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,230 +0,0 @@
-<LevelInfo
- name = "Quests showcase"
- description = "Level to test and showcase quests."
- tags = "test, showcase"
- screenshot = "questsshowcase.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-    <templates>
-        <Template link=lodtemplate_default />
-    </templates>
-    <?lua include("includes/notifications.oxi") ?>
-
-    <Scene
-        ambientlight = "0.5, 0.5, 0.5"
-        skybox       = "Orxonox/Starbox"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <GlobalQuest id="quest0">
-            <QuestDescription title="Quest 0" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-
-            Ut consequat leo ut quam congue semper et eget nibh. Nunc sit amet velit eu lorem pretium adipiscing eu ut ante. Nulla facilisi. Pellentesque interdum, neque nec consectetur vulputate, mauris risus feugiat nunc, ac sollicitudin neque quam ut tellus. Morbi elit velit, tincidunt et hendrerit eget, rutrum at erat. Duis eros nulla, faucibus vitae blandit vitae, pharetra sollicitudin justo." failMessage="Fail message 0" completeMessage="Complete message 0" />
-        </GlobalQuest>
-        <GlobalQuest id="quest1">
-            <QuestDescription title="Quest 1" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor." failMessage="Fail message 1" completeMessage="Complete message 1" />
-            <hints>
-                <QuestHint id="quest1hint1">
-                    <QuestDescription title="The super Hint." description="Be proud of yourself." />
-                </QuestHint>
-                <QuestHint id="quest1hint2">
-                    <QuestDescription title="The super Hint2." description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor." />
-                </QuestHint>
-                <QuestHint id="quest1hint3">
-                    <QuestDescription title="The super Hint3." description="Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus." />
-                </QuestHint>
-            </hints>
-            <subquests>
-                <GlobalQuest id="quest1.1">
-                    <QuestDescription title="Quest 1: Subquest 1" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam." failMessage="Fail message 2" completeMessage="Complete message 2" />
-                </GlobalQuest>
-                <GlobalQuest id="quest1.2">
-                    <QuestDescription title="Quest 1: Subquest 2" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor." failMessage="Fail message 2" completeMessage="Complete message 2" />
-                </GlobalQuest>
-                <GlobalQuest id="quest1.3">
-                    <QuestDescription title="Quest 1: Subquest 3" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas." failMessage="Fail message 2" completeMessage="Complete message 2" />
-                </GlobalQuest>
-                <GlobalQuest id="quest1.4">
-                    <QuestDescription title="Quest 1: Subquest 4" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit." failMessage="Fail message 2" completeMessage="Complete message 2" />
-                </GlobalQuest>
-                <GlobalQuest id="quest1.5">
-                    <QuestDescription title="Quest 1: Subquest 5" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam." failMessage="Fail message 2" completeMessage="Complete message 2" />
-                </GlobalQuest>
-            </subquests>
-        </GlobalQuest>
-        <GlobalQuest id="quest2">
-            <QuestDescription title="Quest 2" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac." failMessage="Fail message 2" completeMessage="Complete message 2" />
-        </GlobalQuest>
-        <GlobalQuest id="quest3">
-            <QuestDescription title="Quest 3" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit." failMessage="Fail message 1" completeMessage="Complete message 1" />
-        </GlobalQuest>
-        <GlobalQuest id="quest4">
-            <QuestDescription title="Quest 4" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. Integer a nisl odio, in iaculis tortor. Nam erat erat, commodo quis tincidunt et, congue at quam. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-
-            Ut consequat leo ut quam congue semper et eget nibh. Nunc sit amet velit eu lorem pretium adipiscing eu ut ante. Nulla facilisi. Pellentesque interdum, neque nec consectetur vulputate, mauris risus feugiat nunc, ac sollicitudin neque quam ut tellus. Morbi elit velit, tincidunt et hendrerit eget, rutrum at erat. Duis eros nulla, faucibus vitae blandit vitae, pharetra sollicitudin justo. Donec luctus est a tortor auctor feugiat." failMessage="Fail message 1" completeMessage="Complete message 1" />
-        </GlobalQuest>
-        <GlobalQuest id="quest5">
-            <QuestDescription title="Quest 5" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa." failMessage="Fail message 1" completeMessage="Complete message 1" />
-        </GlobalQuest>
-        <GlobalQuest id="quest6">
-            <QuestDescription title="Quest 6" description="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus at dolor quis dui gravida faucibus quis ut augue. Nulla sed accumsan nulla. Sed eleifend arcu ante, vel congue neque. Praesent vel felis sit amet lacus elementum laoreet at et massa. Pellentesque imperdiet orci sit amet sem gravida a ornare odio tempor. Donec posuere scelerisque purus, et porttitor ipsum dictum ac. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed non turpis non eros porttitor dignissim. Phasellus at elit vel diam gravida malesuada ut a lorem. Etiam vel lacus massa. In arcu neque, ultrices at placerat in, facilisis a metus. Curabitur erat nunc, molestie sed pretium ac, ullamcorper eget tellus. Vivamus tortor magna, mollis ut vulputate vel, lacinia nec neque. " failMessage="Fail message 1" completeMessage="Complete message 1" />
-        </GlobalQuest>
-
-        <EventMultiTrigger name=spawntrigger>
-            <events>
-                <trigger>
-                    <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-                </trigger>
-            </events>
-        </EventMultiTrigger>
-
-        <QuestEffectBeacon times=1>
-            <effects>
-                <AddQuest questId="quest0" />
-                <AddQuest questId="quest1" />
-                <AddQuest questId="quest1.1" />
-                <AddQuest questId="quest1.2" />
-                <AddQuest questId="quest1.3" />
-                <AddQuest questId="quest1.4" />
-                <AddQuest questId="quest1.5" />
-                <AddQuest questId="quest2" />
-                <AddQuest questId="quest3" />
-                <AddQuest questId="quest4" />
-                <AddQuest questId="quest5" />
-                <AddQuest questId="quest6" />
-                <AddQuestHint hintId ="quest1hint1" />
-                <AddQuestHint hintId ="quest1hint2" />
-                <AddQuestHint hintId ="quest1hint3" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=spawntrigger />
-                </execute>
-            </events>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="-100,0,0" times=1>
-            <effects>
-                <FailQuest questId="quest1.1" />
-                <FailQuest questId="quest1.2" />
-                <FailQuest questId="quest1.3" />
-                <FailQuest questId="quest1.4" />
-                <FailQuest questId="quest1.5" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=dtrigger1 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="1.0,0,0" material="Examples/Flare" />
-                <DistanceTrigger name=dtrigger1 position="0,0,0" distance=10 target="Pawn" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="100,0,0" times=-1>
-            <effects>
-                <CompleteQuest questId="quest0" />
-                <CompleteQuest questId="quest1" />
-                <CompleteQuest questId="quest1.1" />
-                <CompleteQuest questId="quest1.2" />
-                <CompleteQuest questId="quest1.3" />
-                <CompleteQuest questId="quest1.4" />
-                <CompleteQuest questId="quest1.5" />
-                <CompleteQuest questId="quest2" />
-                <CompleteQuest questId="quest3" />
-                <CompleteQuest questId="quest4" />
-                <CompleteQuest questId="quest5" />
-                <CompleteQuest questId="quest6" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=dtrigger2 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="0,1.0,0" material="Examples/Flare" />
-                <DistanceTrigger name=dtrigger2 position="0,0,0" distance=10 target="Pawn" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <!--QuestEffectBeacon position="0,0,100" times=-1>
-            <effects>
-                <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt1 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt1 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="-100,0,0" times=-1>
-            <effects>
-                <FailQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt2 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="1.0,0,0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt2 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="100,0,0" times=-1>
-            <effects>
-                <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt3 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="0,1.0,0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt3 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="0,100,0" times=-1>
-            <effects>
-                <AddQuestHint hintId="022a859d-08dd-4eac-a085-c28c29c06d48" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt4 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="0,0,1.0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt4 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
-            <events>
-                <activity>
-                    <QuestListener questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" mode="complete" />
-                </activity>
-            </events>
-        </ParticleEmitter-->
-
-    </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/screenshot.oxw
===================================================================
--- code/branches/release2012/data/levels/screenshot.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/screenshot.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,141 +0,0 @@
-<LevelInfo
- name = "Screenshot"
- description = "Level to make awesome screenshots in."
- tags = "test, showcase"
- screenshot = "screenshot.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level
- gametype = "TeamDeathmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-    <!--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" /-->
-    <Light type=directional position="1100, 11000, -7000" lookat="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-    <TeamSpawnPoint team=0 position="1100, 11000, -7000" orientation="0.509856, -0.379863, 0.650825, 0.414944" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <SpaceShip position="1170, 11250, -6780" roll=90>
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1100 team=0>
-          <waypoints>
-            <StaticEntity position="1000,10300,-7000" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="1100,10700,-7000" roll=90>
-      <templates>
-        <Template link=spaceshippirate />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=0 team=0 />
-      </controller>
-    </SpaceShip>
-    <SpaceShip position="1100,10600,-7000" roll=90>
-      <templates>
-        <Template link=spaceshippirate />
-      </templates>
-    </SpaceShip>
-
-<!--
-    <TeamSpawnPoint team=1 position="2000,  0,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000, 50,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000,100,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000,150,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-
-    <TeamSpawnPoint team=2 position="1000,  0,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000, 50,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000,100,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000,150,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
--->
-
-    <StaticEntity position="1100,9700,-7500" lookat="1500, 10000, -6700" yaw="-90" pitch="-90">
-      <attached>
-        <Model scale=10 mesh="Carrier.mesh" />
-        <Model position="0,30,20" scale=10 mesh="pirate.mesh" roll="180" />
-        <Model position="-80,-30,20" scale=10 mesh="pirate.mesh" roll="180" />
-      </attached>
-    </StaticEntity>
-
-    <?lua
-      elements = {"BodyDebris1.mesh", "CockpitDebris.mesh", "LightningGun.mesh", "WingDebris1.mesh", "WingDebris2.mesh", "satellitedish.mesh", "Thruster.mesh"}
-      sizes = {4, 4, 4, 4, 4, 10, 20}
-      
-      elements.length = function()
-        return table.getn(elements)
-      end
-      
-      for i = 1, 150, 1 do
-        x = math.random() * 750 - 375 + 1000
-        y = math.random() * 1000 - 500 + 10200
-        z = math.random() * 500 - 250 - 6600
-        e = math.floor(math.random()*elements.length()+1)
-    ?>
-
-      <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) ?>">
-        <attached>
-          <Model position="0,0,0" scale="<?lua print(sizes[e]) ?>" mesh="<?lua print( elements[e]) ?>" />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/shieldTest.oxw
===================================================================
--- code/branches/release2012/data/levels/shieldTest.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/shieldTest.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,81 +0,0 @@
-<LevelInfo
- name = "Shield Testlevel"
- description = "A simple Level with one shielded drone to shoot at"
- tags = "test"
- screenshot = "shieldtestlevel.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipImmTest.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-
-<templates>
-  <Template link=lodtemplate_default />
-</templates>
-<?lua include("includes/notifications.oxi") ?>
-
-<Scene
-   ambientlight = "0.8, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
->
-
-<Drone name="meineDrohne"
-    primarythrust= "80"
-    auxilarythrust= "10"
-    rotationthrust= "10"
-    mass= "50"
-    linearDamping= "0.9"
-    angularDamping= "0.7"
-
-    health= 100
-    maxhealth= 150
-    inithealth= 200
-
-    shieldhealth= 100
-    initialshieldhealth= 200
-    maxshieldhealth= 250
-
-    shieldabsorption= 1
-
-    reloadrate= "10"
-    reloadwaittime= 1
-
->
-  <attached>
-    <Model scale="4" mesh="drone.mesh"/>
-  </attached>
-  <collisionShapes>
-    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
-  </collisionShapes>
-</Drone>
-
-<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" />
-
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <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=spaceshipimmtest />
-    <?lua end ?>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="20" />
-      </collisionShapes>
-    </StaticEntity>
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/sound.oxw
===================================================================
--- code/branches/release2012/data/levels/sound.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/sound.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,59 +0,0 @@
-<LevelInfo
- name = "Sound showcase"
- description = "Level to test and showcase sound."
- tags = "test, showcase"
- screenshot = "soundshowcase.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-  <WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
-  <WorldAmbientSound source="Mars.ogg" looping="true">
-    <events>
-      <activity>
-        <DistanceTrigger position="400,0,0" distance=200 target="Camera">
-          <attached>
-            <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
-          </attached>
-        </DistanceTrigger>
-      </activity>
-    </events>
-  </WorldAmbientSound>
-  <WorldAmbientSound source="Jupiter.ogg" looping="true">
-    <events>
-      <activity>
-        <DistanceTrigger position="400,150,0" distance=200 target="Camera">
-          <attached>
-            <ParticleSpawner position="0,0,0" source="Orxonox/fire3" lifetime=0 loop=0 autostart=1 />
-          </attached>
-        </DistanceTrigger>
-      </activity>
-    </events>
-  </WorldAmbientSound>
-
-
-  <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" />
-  <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-  
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt
===================================================================
--- code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/templates/spaceshipAssff2.oxt	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,117 +0,0 @@
-<Template name=spaceshipassff2>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras2
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 50
-   maxhealth         = 100
-   initialhealth     = 50
-
-   shieldhealth        = 130
-   initialshieldhealth = 130
-   maxshieldhealth     = 150
-   shieldabsorption    = 0.95
-   reloadrate          = 5
-   reloadwaittime      = 0.5
-
-   primaryThrust     = 100
-   auxilaryThrust    = 30
-   rotationThrust    = 50
-
-   lift = 1;
-   stallSpeed = 220;
-
-   boostPower            = 10
-   boostPowerRate        = 1
-   boostRate             = 5
-   boostCooldownDuration = 10
-
-   shakeFrequency = 15
-   shakeAmplitude = 9
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipassffengine2 />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipassffengine2 />
-    </engines>
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("../includes/weaponSettingsAssff2.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras2 defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
-      <CameraPosition position="0,20, 80" drag=true mouselook=true />
-      <CameraPosition position="0,30,120" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffengine2 baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <EffectContainer condition="idle">
-      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="-7.6, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <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" />
-      <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" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <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" />
-      <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" />
-    </EffectContainer>
-<!--    <EffectContainer condition="brake">
-      <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 />
-      <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 />
-      <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 />
-      <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 />
-    </EffectContainer>
--->
-  </MultiStateEngine>
-</Template>

Deleted: code/branches/release2012/data/levels/templates/tower.oxt
===================================================================
--- code/branches/release2012/data/levels/templates/tower.oxt	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/templates/tower.oxt	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,37 +0,0 @@
-<Template name=tower>
-  <Tower
-
-
-   explosionchunks        = 6
-
-   reloadrate          = 3
-   reloadwaittime      = 1
-
-   collisionType     = "dynamic"
-   team = 2
-
-
-  >
-    <controller>
-        <WaypointPatrolController alertnessradius=1000 team=5>
-            <waypoints>
-                <Model mesh="cube.mesh" scale=0 position=" 700, 200, 100" />
-            </waypoints>
-        </WaypointPatrolController>
-    </controller>
-
-
-    <attached>
-        <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
-    </attached>
-
-    <!--collisionShapes>
-
-    </collisionShapes-->
-
-<?lua
-  include("../includes/towerWeaponSettings.oxi")
-?>
-  </Tower>
-</Template>
-

Deleted: code/branches/release2012/data/levels/testStars.oxw
===================================================================
--- code/branches/release2012/data/levels/testStars.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/testStars.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,53 +0,0 @@
-<LevelInfo
- name = "Stars Testlevel"
- description = "Level to test stars"
- tags = "test"
- screenshot = "starstestlevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-  >
-
-<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
-      <attached>
-        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
-          <attached>
-            <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
-            <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
-            <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
-            <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
-          </attached>
-        </Model>
-      </attached>
-    </Rocket-->
-
-    <CreateStars numStars="6000" material="Examples/Flare" colour="1,1,1" radius=10000 colourDiff=0.1/>
-
-    <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" />
-    <SpawnPoint position="0,0,100" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <ParticleEmitter position="0,10000,0" source="Orxonox/fog" />
-    <ParticleEmitter position="6000,7000,0" source="Orxonox/fog2" />
-    <ParticleEmitter position="-6000,-7000,0" source="Orxonox/fog3" />
-    <ParticleEmitter position="-6000,0,9000" source="Orxonox/fog4" />
-    <ParticleEmitter position="2000,-7000,-5963" source="Orxonox/fog3" />
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/testSwallow.oxw
===================================================================
--- code/branches/release2012/data/levels/testSwallow.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/testSwallow.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,61 +0,0 @@
-<LevelInfo
- name = "Swallow Testlevel"
- description = "Level to test the swallow spaceship."
- tags = "test"
- screenshot = "swallowtestlevel.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipSwallow.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-    <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" />
-
-<SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
-
-
-<?lua
-max = 20
-for i = 1, max, 1
-do
-    x = math.sin(i/max*6)*40000
-    y = math.cos(i/max*6)*40000
-    z = i*100
-    ?>
-<?lua
-for k = 1, 25, 1
-do
-j = math.random()
-?>
-
-    <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) ?>">
-      <attached>
-        <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <?lua if i == 5 then ?><collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-      </collisionShapes> <?lua end ?>
-    </MovableEntity>
-<?lua
-end
-?>
-<?lua end ?>
-    <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 />
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/release2012/data/levels/towerDefense.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/towerDefense.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,140 +0,0 @@
-<!-- TODO: Update the level's image-->
-
-<!-- See TowerDefenseReadme.txt for Information on this file -->
-
-<LevelInfo
- name = "Tower Defense"
- description = "Defend your Spacestation from incoming waves."
- tags = "minigame"
- screenshot = "emptylevel.png"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("HUDTemplates3.oxo")
-  include("towerdefenseHUD.oxo")
-  include("templates/lodInformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/tower.oxt")
-?>
-
-<!-- Specify the position of the camera -->
-<Template name=centerpointmarkcamera defaults=0>
-  <Pawn>
-    <camerapositions>
-      <CameraPosition position="0,0,1500"/>
-    </camerapositions>
-  </Pawn>
-</Template>
-
-<!-- Loads a mesh to mark the center-->
-<Template name=centerpointmark>
-  <Pawn camerapositiontemplate=centerpointmarkcamera>
-    <attached>
-      <Model position="0,0,0" mesh="cylinder.mesh" scale3D="1,1,1" /> <!-- the camera is attached to this -->
-    </attached>
-  </Pawn>
-</Template>
-
-
-<!-- Template for a tower   EDIT: new towertemplate is included with "templates/tower" -->
-<!--Template name=towertemplate>
-  <Tower>
-    <attached>
-      <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
-    </attached>
-  </Tower>
-</Template-->
-
-
-
-
-
-<Level gametype = "TowerDefense">
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-
-    <!-- Spawns the camera, attached to a crate -->
-    <SpawnPoint team=0 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />
-    <!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-    <!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff  /-->
-    <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-    <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointController accuracy=60>
-          <waypoints>
-            <!-- 1,3 10,3 10,11, 13,11 -->
-            <Model mesh="cube.mesh" scale=0 position="-700,-500, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 200,-500, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 200, 300, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 500, 300, 150" />
-            <Model mesh="cube.mesh" scale=0 position=" 500, 700, 150" />
-          </waypoints>
-        </WaypointController>
-      </controller>
-    </SpaceShip>
-
-
-    <!--invisible entity to attach towers to, since playfield is static and towers are dynamic-->
-    <StaticEntity position=0,0,0>
-
-        <attached>
-            <Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
-            <!-- Base -->
-            <Model position="500,700,100" mesh="sphere.mesh" scale=80 />
-            <!--Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" /--> <!-- Only temporary needed to help align the collisionshape -->
-            <!-- This was used to mark the playfield, let's let it be here for now -->
-            <!--Model position="-8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
-            <!--Model position="-8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
-            <!--Model position="8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
-            <!--Model position="8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
-        </attached>
-        <collisionShapes> <!-- The collisionshape forbids other worldentities that have a collisionShape to fly through it.
-
-                               TODO: Find correct size for the collisionshape; since a collisionShape is invisible
-                               I added the crate wich currently has the same dimensions as the collisionshape.
-                               You have to adjust the crate's scale3D as well as the collisionshape's halfExtens to
-                               find the proper shape. -->
-           <BoxCollisionShape position="0,0,0" halfExtents="400,400,100" />
-        </collisionShapes>
-    </StaticEntity>
-
-
-
-
-    <!-- PlayField -->
-    <TowerDefenseCenterpoint
-    name=towerdefensecenter
-    width=16
-    height=16
-    tileScale=100
-    towerTemplate=tower
-    position="0,0,0"
-    direction="0,0,0"
-    collisionType=dynamic
-    mass=100000>
-
-    </TowerDefenseCenterpoint>
-
-  </Scene>
-</Level>
-

Deleted: code/branches/release2012/data/levels/tutorial.oxw
===================================================================
--- code/branches/release2012/data/levels/tutorial.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/tutorial.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,111 +0,0 @@
-<LevelInfo
- name = "Coding Tutorial"
- description = "Level for the coding tutorial."
- tags = "tutorial, shipselection"
- screenshot = "codingtutorial.png"
- startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipGhost.oxt")
-  include("templates/spaceshipSpacecruiser.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-<Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
-  <attached>
-    <Model scale="1" mesh="drone.mesh"/>
-  </attached>
-  <collisionShapes>
-    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
-  </collisionShapes>
-</Drone>
-
-    <Drone name="meineDrohne" primarythrust="80" auxilarythrust="10" rotationthrust="10" mass= "50" linearDamping = "0.9" angularDamping = "0.7">
-      <attached>
-        <Model scale="1" mesh="rocket.mesh"/>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
-      </collisionShapes>
-    </Drone>
-
-    <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" />
-
-    <Model mesh="hs-w01.mesh" scale=10 position="0,0,-100" />
-    <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <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=shipselection />
-    <?lua end ?>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="20" />
-      </collisionShapes>
-    </StaticEntity>
-
-<!--
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
--->
-
-  </Scene>
-</Level>

Deleted: code/branches/release2012/data/levels/waypoints.oxw
===================================================================
--- code/branches/release2012/data/levels/waypoints.oxw	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/data/levels/waypoints.oxw	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,160 +0,0 @@
-<LevelInfo
- name = "Waypoints Testlevel"
- description = "Testing waypoings for AI controlled spaceships."
- tags = "test"
- screenshot = "waypointstestlevel.png"
-/>
-
-<?lua
-  include("HUDTemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceshipAssff.oxt")
-  include("templates/spaceshipH2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/lodInformation.oxt")
-?>
-
-<Level>
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-  <?lua include("includes/notifications.oxi") ?>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skyBoxBasic"
-  >
-    <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" />
-
-    <SpawnPoint position="0,0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <SpaceShip position="0,2000,200" lookat="0,0,0">
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1000 team=10>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=8 position="  0,2000,-200" />
-            <Model mesh="cube.mesh" scale=8 position="  0,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="500,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="500,2000,-200" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-    <SpaceShip position="0,2000,400" lookat="0,0,0">
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1000 team=10>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=8 position="  0,2000,-200" />
-            <Model mesh="cube.mesh" scale=8 position="  0,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="500,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="500,2000,-200" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="1500,2000,200" lookat="0,0,0">
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1000 team=11>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=8 position="1500,2000,-200" />
-            <Model mesh="cube.mesh" scale=8 position="1500,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="1000,2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="1000,2000,-200" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="1500,-2000,200" lookat="0,0,0" name=polonaise1>
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1000 team=12>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=8 position="1500,-2000,-200" />
-<!--
-            <Attacher target=polonaise6 deletewithparent=false />
-            <Model mesh="cube.mesh" scale=8 position="1500,-2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="1000,-2000,-700" />
-            <Model mesh="cube.mesh" scale=8 position="1000,-2000,-200" />
--->
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <?lua
-      for i = 1, 5, 1 do
-    ?>
-      <SpaceShip position="1500,<?lua print(-2000 + 50*i) ?>,200" lookat="0,0,0" name=polonaise<?lua print(i+1) ?> >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=12>
-            <waypoints>
-              <Attacher target=polonaise<?lua print(i) ?> deletewithparent=false />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-    <SpaceShip position="-1500,-2000,200" lookat="0,0,0" name=attack1>
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=1000 team=13>
-          <waypoints>
-            <Model mesh="cube.mesh" scale=8 position="1500,-2000,-200" />
-          </waypoints>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-    <?lua
-      for i = 1, 5, 1 do
-    ?>
-      <SpaceShip position="-1500,<?lua print(-2000 + 50*i) ?>,200" lookat="0,0,0" name=attack<?lua print(i+1) ?> >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <WaypointPatrolController alertnessradius=1000 team=13>
-            <waypoints>
-              <Attacher target=attack<?lua print(i) ?> deletewithparent=false />
-            </waypoints>
-          </WaypointPatrolController>
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
-
-<!--
-    <?lua
-      for i = 1, 50, 1 do
-    ?>
-      <SpaceShip position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" >
-        <templates>
-          <Template link=spaceshipassff />
-        </templates>
-        <controller>
-          <AIController />
-        </controller>
-      </SpaceShip>
-    <?lua end ?>
--->
-
-  </Scene>
-</Level>

Modified: code/branches/release2012/src/modules/CMakeLists.txt
===================================================================
--- code/branches/release2012/src/modules/CMakeLists.txt	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/src/modules/CMakeLists.txt	2012-09-01 15:04:18 UTC (rev 9359)
@@ -37,4 +37,3 @@
 ADD_SUBDIRECTORY(tetris)
 ADD_SUBDIRECTORY(weapons)
 ADD_SUBDIRECTORY(docking)
-ADD_SUBDIRECTORY(towerdefense)

Modified: code/branches/release2012/src/orxonox/controllers/CMakeLists.txt
===================================================================
--- code/branches/release2012/src/orxonox/controllers/CMakeLists.txt	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/src/orxonox/controllers/CMakeLists.txt	2012-09-01 15:04:18 UTC (rev 9359)
@@ -4,7 +4,6 @@
   NewHumanController.cc
   ArtificialController.cc
   AIController.cc
-  ScriptController.cc
   WaypointController.cc
   WaypointPatrolController.cc
   DroneController.cc

Deleted: code/branches/release2012/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/release2012/src/orxonox/controllers/ScriptController.cc	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/src/orxonox/controllers/ScriptController.cc	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,40 +0,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Fabian 'x3n' Landau
- *   Co-authors:
- *      ...
- *
- */
-
-#include "ScriptController.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
-    CreateFactory(ScriptController);
-
-    ScriptController::ScriptController(BaseObject* creator) : ArtificialController(creator)
-    {
-        RegisterObject(ScriptController);
-    }
-}

Deleted: code/branches/release2012/src/orxonox/controllers/ScriptController.h
===================================================================
--- code/branches/release2012/src/orxonox/controllers/ScriptController.h	2012-09-01 09:35:44 UTC (rev 9358)
+++ code/branches/release2012/src/orxonox/controllers/ScriptController.h	2012-09-01 15:04:18 UTC (rev 9359)
@@ -1,47 +0,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Fabian 'x3n' Landau
- *   Co-authors:
- *      ...
- *
- */
-
-#ifndef _ScriptController_H__
-#define _ScriptController_H__
-
-#include "OrxonoxPrereqs.h"
-#include "ArtificialController.h"
-
-namespace orxonox
-{
-    class _OrxonoxExport ScriptController : public ArtificialController
-    {
-        public:
-            ScriptController(BaseObject* creator);
-            virtual ~ScriptController() { }
-
-        private:
-    };
-}
-
-#endif /* _ScriptController_H__ */




More information about the Orxonox-commit mailing list