[Orxonox-commit 435] r2153 - in media: levels levels/includes levels/old levels/templates overlay

landauf at orxonox.net landauf at orxonox.net
Sat May 23 03:44:34 CEST 2009


Author: landauf
Date: 2009-05-23 03:44:34 +0200 (Sat, 23 May 2009)
New Revision: 2153

Added:
   media/levels/includes/
   media/levels/includes/CuboidSpaceStation.lua
   media/levels/includes/weaponsettings1.oxi
   media/levels/includes/weaponsettings2.oxi
   media/levels/includes/weaponsettings_H2.oxi
   media/levels/includes/weaponsettings_pirate.oxi
   media/levels/old/
   media/levels/old/CuboidSpaceStation.oxw
   media/levels/old/physicstest.oxw
   media/levels/old/physicstest2.oxw
   media/levels/old/planettest.oxw
   media/levels/old/presentation_physics.oxw
   media/levels/old/princessaeryn.oxw
   media/levels/old/questsystem.oxw
   media/levels/old/sample4.oxw
   media/levels/old/spaceshiptemplates_physics.oxw
   media/levels/old/tutorial_hs08.oxw
   media/levels/templates/
   media/levels/templates/spaceship_H2.oxt
   media/levels/templates/spaceship_assff.oxt
   media/levels/templates/spaceship_pirate.oxt
   media/overlay/hudtemplates3.oxo
   media/overlay/ponghud.oxo
Removed:
   media/levels/CuboidSpaceStation.lua
   media/levels/CuboidSpaceStation.oxw
   media/levels/hudtemplates.oxw
   media/levels/hudtemplates3.oxw
   media/levels/physicstest.oxw
   media/levels/physicstest2.oxw
   media/levels/planettest.oxw
   media/levels/ponghud.oxw
   media/levels/presentation_physics.oxw
   media/levels/princessaeryn.oxw
   media/levels/questsystem.oxw
   media/levels/sample.oxw
   media/levels/sample2.oxw
   media/levels/sample3.oxw
   media/levels/sample4.oxw
   media/levels/spaceship_H2.oxw
   media/levels/spaceshiptemplates.oxw
   media/levels/spaceshiptemplates2.oxw
   media/levels/spaceshiptemplates3.oxw
   media/levels/spaceshiptemplates_physics.oxw
   media/levels/spaceshiptemplates_pirate.oxw
   media/levels/spaceshiptemplates_presentation.oxw
   media/levels/tutorial_hs08.oxw
   media/levels/weaponsettings1.oxw
   media/levels/weaponsettings2.oxw
   media/levels/weaponsettings_H2.oxw
   media/levels/weaponsettings_pirate.oxw
Modified:
   media/levels/empty_level.oxw
   media/levels/gametype_asteroids.oxw
   media/levels/gametype_underattack.oxw
   media/levels/pickuptest.oxw
   media/levels/presentation.oxw
   media/levels/presentation_dm.oxw
   media/levels/presentation_pong.oxw
   media/levels/teambasematchlevel.oxw
   media/levels/tutorial.oxw
   media/overlay/OrxonoxLoading.overlay
Log:
Cleaned up level directory.

Levels (*.oxw):    /levels/
Includes (*.oxi):  /levels/includes/ (for example weaponsettings1.oxi)
Templates (*.oxt): /levels/templates/ (formerly spaceshiptemplates_*)
Huds (*.oxo):      /overlay/ (moved from /levels/ to /overlay/)

Old level files and other stuff was moved to /levels/old/. This directory is not used, but serves as an archive.

For the weapons branch (and the trunk after weapons will be merged), change line 37 in /levels/templates/spaceship_assff.oxt from weaponsettings1 to weaponsettings2 to be able to shoot again.


Deleted: media/levels/CuboidSpaceStation.lua
===================================================================
--- media/levels/CuboidSpaceStation.lua	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/CuboidSpaceStation.lua	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,678 +0,0 @@
-----------------------------------------------------------------------------------------------------
--- This lua script creates a totally random generated space station for the orxonox computer game!--
--- (c) Wallah 2008, published under GPL licence!												  --
-----------------------------------------------------------------------------------------------------
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- IMPORTANT: If you need more parameters, do the following: copy the actual function (just the headline and the end statement) to the end of the file,			  --
--- like I did with createSpaceStation() and let that function call the new function where you can modify the parameters. For all parameters which the old function--
--- doesn't have you just give the standard default values, which I have defined. This is to make sure, that anyone else who uses the old function can still use it--
--- the same way he/she always did. If you want a function with less parameters, just create a new one at the end of the file and call this function with some	  --
--- default values. REMEMBER: Function overloading is not possible, be sure to call your function differently from others already existing ones.					  --
---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- This function creates a randomly generated space station.
--- The first argument ranSeed, must be 0, or a positive Integer, if it is 0 your space station is always chosen randomly, if you give an integer,
---	your space station will be generated randomly, but once you have the space station it will always be the same.
--- The argument xLength defines how large the space station will be into the x-direction.
--- The argument xVar defines how much the space station will vary at the ends in x-direction, this is so that the station is no cube.
--- The argument yLength is the same as xLength, but for the y-direction.
--- The argument yVar is the same as xLength, but for the y-direction.
--- The argument zLength is the same as xLength, but for the z-direction.
--- The argument zVar is the same as xLength, but for the z-direction.
--- The argument sSScale scales the station proportionally in all directions.
-function createSpaceStationPar(ranSeed, xLength, xVar, yLength, yVar, zLength, zVar, sSScale)
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- This prints xml code, which creates a MovableEntity, which I need to attach all the parts of the space station.
-print("<MovableEntity scale=1 position=\"0,0,0\" >")
--- End create Movable Entity.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Create a randomseed, so that the math.random() function is actually random.
-if ranSeed == 0 then
-	math.randomseed(os.time())
-else
-	math.randomseed(ranSeed)
-end
--- End create randomseed.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Here you can define some global variables, with which you can modify the space station.
-
--- Define the maximal size of the grid, this value is based on how large you define the area of bodyparts plus 20 gridpoints for attachparts.
-sSSize=30
-if xLength>=yLength and xLength>=zLength then
-	sSSize=xLength+20
-elseif yLength>=xLength and yLength>=zLength then
-	sSSize=yLength+20
-elseif zLength>=xLength and zLength>=yLength then
-	sSSize=zLength+20
-end
--- Define how many parts the space station has, this value has to be exact, so be sure to increment it if you're adding a new part.
-sSParts=9
--- Define how many body parts the space station has, this value has to be exact. Body part means a part, which has connections at least in two directions.
-sSBodyParts=3
--- Define how many frontParts you have.
-frontParts=1
--- Define how many backParts you have.
-backParts=1
--- Define how many side parts for the left side you have.
-leftSideParts=1
--- Define how many side parts for the right side you have.
-rightSideParts=1
--- Define how many top parts you have.
-topParts=2
--- Define how many connection parts you have.
-connParts=1
--- Define the maximal dimension of a single part, be sure this value is big enough, better it's too big, it's only a matter of efficiency.
--- It should be at least 1 bigger than the biggest part needs, because I guarantee that it works with odd numbers, to do so I use the math.floor function.
-pDim=6
--- Define the griddimension, be sure this value matches the size of a single space station part plus the size of a connection part, which means your parts must be:
---	integer*(gridDim-connectionSize), then integer tells you how many griddimensions your part is.
-gridDim=2.25
--- End define global parameters.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- This creates a 4-dimensional grid, which tells us if there is a part or not, and in which direction it has connections.
--- The parameters x,y,z are the axis of the space station, which iterate to sSSize, the maximal size of the space station.
--- The griddimension, this word I will use later, means that the distance of a point to the next point is gridDim in the game, so the absolute x-axis is x*gridDim*sSScale,
---	and so on for the other dimensions y and z.
--- grid[x][y][z][0] contains 0 if there is no part at the position (x,y,z), otherwise 1.
--- grid[x][y][z][1] contains 0 if there is no connection from (x,y,z) in x-direction, "+" if there is one in the positive x-direction,
---	"-" if there is one in the negative x-direction, "+-" if there are in both x-directions.
--- grid[x][y][z][2] contains 0 if there is no connection from (x,y,z) in y-direction, "+" if there is one in the positive y-direction,
---	"-" if there is one in the negative y-direction, "+-" if there are in both y-directions.
--- grid[x][y][z][3] contains 0 if there is no connection from (x,y,z) in z-direction, "+" if there is one in the positive z-direction,
---	"-" if there is one in the negative z-direction, "+-" if there are in both z-directions.
-grid = {}
-for x=-math.floor(sSSize/2),math.floor(sSSize/2) do
-	grid[x] = {}
-	for y=-math.floor(sSSize/2),math.floor(sSSize/2) do
-		grid[x][y]= {}
-		for z=-math.floor(sSSize/2),math.floor(sSSize/2) do
-			grid[x][y][z]={}
-			for i=0,3 do
-				grid[x][y][z][i]=0
-			end
-		end
-	end
-end
--- End create 4-dim grid.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- This creates an array which stores all the parts, it's size is depending on the global values pDim and sSParts.
--- The first parameter i, tells us how many parts fit into the array, so it iterates from 1 to sSParts, each part has his own value i.
--- The second, third and fourth parameters are the relative coordinates of the part, you have to start at (0,0,0) and be sure you fill the array into the right direction.
---	A short example: your part is 2 griddimensions long and you place it in the game, that the relative coordinate point is at (0,0,0) and the part lies in the positive
---	z-axis, then you have to use the coordinate point (0,0,1).
--- The fifth parameter is an array with size 4, at index=0, you have to set 1 if your part covers the gridpoint at (x,y,z), otherwise 0.
---	At index=1,2,3 you define the possible connection directions (1 for x, 2 for y and 3 for z), be sure to use the notation from above (0, "+-", "+", "-").
-bodyParts={}
-for i=1,sSParts do
-	bodyParts[i]={}
-	for x=-math.floor(pDim/2),math.floor(pDim/2) do
-		bodyParts[i][x]={}
-		for y=-math.floor(pDim/2),math.floor(pDim/2) do
-			bodyParts[i][x][y]={}
-			for z=-math.floor(pDim/2),math.floor(pDim/2) do
-				bodyParts[i][x][y][z]={}
-				for k=0,3 do
-					bodyParts[i][x][y][z][k]=0
-				end
-			end
-		end
-	end
-	-- This contains the name of the mesh file.
-	bodyParts[i][0][0][0][4]=""
-	-- This contains the first possible rotation of your part, pitch=... yaw=... roll=... .
-	bodyParts[i][0][0][0][5]=""
-	-- This contains the second possible rotation of your part, pitch=... yaw=... roll=... .
-	bodyParts[i][0][0][0][6]=""
-	-- This contains the third possible rotation of your part, pitch=... yaw=... roll=... .
-	bodyParts[i][0][0][0][7]=""
-	-- Contains the movement rotation, rotationaxis=... rotationrate=... .
-	bodyParts[i][0][0][0][8]=""
-	-- Contains the attachment, if your part has an attachment, e.g. <ParticleEmitter .../>.
-	bodyParts[i][0][0][0][9]=""
-	-- Contains how many of this part you want to attach to your space station.
-	bodyParts[i][0][0][0][10]=1
-end
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Here you can add a part to the space station, there are some examples here and how to describe your part is written above in the commentary.
-
--- The part must be inserted so, that the center of reference is at position (0,0,0).
--- At position bodyParts[i][0][0][0][4] you have to put the mesh name of your part.
--- At bodyParts[i][0][0][0][5] you can rotate your part, with pitch=angle, yaw=angle or roll=angle (x,y or z). Positive angle means in screw direction.
--- At bodyParts[i][0][0][0][6] you have another possibility to rotate your part in a different way, e.g. for left and right side parts.
--- At bodyParts[i][0][0][0][7] you have a third possibility to rotate your part, e.g. connection parts must be rotated into 3 different ways.
--- At bodyParts[i][0][0][0][8] you can rotate your part around his own axis, with rotationaxis="x,y,z" rotationrate=number.
--- At bodyParts[i][0][0][0][9] you can attach something to your model, e.g. <ParticleEmitter .../>.
-
--- Insert the CuboidBody, which is only one griddimension and can have connections in every direction.
-bodyParts[1][0][0][0][4]="CuboidBody.mesh"
-
-bodyParts[1][0][0][0][0]=1
-bodyParts[1][0][0][0][1]="+-"
-bodyParts[1][0][0][0][2]="+-"
-bodyParts[1][0][0][0][3]="+-"
--- End insert CuboidBody.
-
--- Insert the DoubleCuboidBody, which is two griddimensions long, and one wide and high and can have connections in every direction except in the middle.
-bodyParts[2][0][0][0][4]="DoubleCuboidBody.mesh"
-bodyParts[2][0][0][0][5]="pitch=-90"
-
-bodyParts[2][0][0][0][0]=1
-bodyParts[2][0][0][0][1]="+-"
-bodyParts[2][0][0][0][2]="+-"
-bodyParts[2][0][0][0][3]="-"
-
-bodyParts[2][0][0][1][0]=1
-bodyParts[2][0][0][1][1]="+-"
-bodyParts[2][0][0][1][2]="+-"
-bodyParts[2][0][0][1][3]="+"
--- End insert DoubleCuboidBody.
-
--- Insert the CuboidConnectionBody, it is three griddimensions long and one wide and high and can have only connections at griddimension 1
---	(except the side in direction of griddimension 2) and griddimension 3 (except the side in direction of griddimension 2).
-bodyParts[3][0][0][0][4]="CuboidConnBody.mesh"
-bodyParts[3][0][0][0][5]="pitch=-90"
-
-bodyParts[3][0][0][0][0]=1
-bodyParts[3][0][0][0][1]="+-"
-bodyParts[3][0][0][0][2]="+-"
-bodyParts[3][0][0][0][3]="-"
-
-bodyParts[3][0][0][1][0]=1
-
-bodyParts[3][0][0][2][0]=1
-bodyParts[3][0][0][2][1]="+-"
-bodyParts[3][0][0][2][2]="+-"
-bodyParts[3][0][0][2][3]="+"
--- End insert CuboidConnectionBody.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Insert the back parts.
--- If you're space station has no back parts, be sure to set backPartsIndex[0]=false.
-backPartsIndex={}
-backPartsIndex[0]=""
-
--- Insert the thruster, which is one griddimension long, two wide and high, it can only have a connection into the negative z-direction.
-backPartsIndex[1]=4
-bodyParts[backPartsIndex[1]][0][0][0][4]="Thruster.mesh"
-bodyParts[backPartsIndex[1]][0][0][0][5]="pitch=-90"
-bodyParts[backPartsIndex[1]][0][0][0][9]="<ParticleEmitter position=\"0,-0.5,0\" source=\"Orxonox/ThrusterFire\" />"
-bodyParts[backPartsIndex[1]][0][0][0][10]=5
-
-bodyParts[backPartsIndex[1]][0][0][0][0]=1
-bodyParts[backPartsIndex[1]][0][0][0][3]="-"
-bodyParts[backPartsIndex[1]][1][0][0][0]=1
-bodyParts[backPartsIndex[1]][-1][0][0][0]=1
-bodyParts[backPartsIndex[1]][0][1][0][0]=1
-bodyParts[backPartsIndex[1]][0][-1][0][0]=1
--- End insert the thruster.
-
--- End insert the back parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Insert the front parts. If your space station has no front parts, be sure to set frontPartsIndex[0]=false.
-frontPartsIndex={}
-frontPartsIndex[0]=""
-
--- The SemiCircleCockpit is 3 x-griddimensions long, 3 y-griddimensions and 2 z-griddimensions, it can only have a connection in the positive z-direction.
-frontPartsIndex[1]=5
-bodyParts[frontPartsIndex[1]][0][0][0][4]="SemiCircleCockpit.mesh"
-bodyParts[frontPartsIndex[1]][0][0][0][5]="pitch=-90 yaw=180"
-bodyParts[frontPartsIndex[1]][0][0][0][9]="<Billboard scale=0.01 position=\"0,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" /> <Billboard scale=0.01 position=\"0.5,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" /> <Billboard scale=0.01 position=\"-0.5,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" />"
-
-bodyParts[frontPartsIndex[1]][0][0][0][0]=1
-bodyParts[frontPartsIndex[1]][0][0][0][3]="+"
-
-bodyParts[frontPartsIndex[1]][-1][0][0][0]=1
-bodyParts[frontPartsIndex[1]][1][0][0][0]=1
-bodyParts[frontPartsIndex[1]][0][-1][0][0]=1
-bodyParts[frontPartsIndex[1]][0][1][0][0]=1
-bodyParts[frontPartsIndex[1]][-1][-1][0][0]=1
-bodyParts[frontPartsIndex[1]][1][-1][0][0]=1
-bodyParts[frontPartsIndex[1]][-1][1][0][0]=1
-bodyParts[frontPartsIndex[1]][1][1][0][0]=1
-bodyParts[frontPartsIndex[1]][0][0][-1][0]=1
-bodyParts[frontPartsIndex[1]][-1][0][-1][0]=1
-bodyParts[frontPartsIndex[1]][1][0][-1][0]=1
-bodyParts[frontPartsIndex[1]][0][-1][-1][0]=1
-bodyParts[frontPartsIndex[1]][0][1][-1][0]=1
-bodyParts[frontPartsIndex[1]][-1][-1][-1][0]=1
-bodyParts[frontPartsIndex[1]][1][-1][-1][0]=1
-bodyParts[frontPartsIndex[1]][-1][1][-1][0]=1
-bodyParts[frontPartsIndex[1]][1][1][-1][0]=1
--- End insert SemiCircleCockpit.
-
--- End insert the front parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Insert the side parts.
--- If your space station has no left side parts, be sure to set leftsidePartsIndex[0]=false.
--- If your space station has no right side parts, be sure to set rightsidePartsIndex[0]=false.
-leftSidePartsIndex={}
-leftSidePartsIndex[0]=""
-rightSidePartsIndex={}
-rightSidePartsIndex[0]=""
-
--- Insert the solar panel, which i wanna use as left and right side part.
-leftSidePartsIndex[1]=6
-rightSidePartsIndex[1]=leftSidePartsIndex[1]
-bodyParts[leftSidePartsIndex[1]][0][0][0][4]="SolarPanel.mesh"
-bodyParts[leftSidePartsIndex[1]][0][0][0][5]="roll=90 pitch="..math.random(0,180)
-bodyParts[rightSidePartsIndex[1]][0][0][0][6]="roll=-90 pitch="..math.random(0,180)
-bodyParts[rightSidePartsIndex[1]][0][0][0][8]="rotationaxis=\"1,0,0\" rotationrate=2"
-bodyParts[leftSidePartsIndex[1]][0][0][0][0]=1
-bodyParts[leftSidePartsIndex[1]][0][0][1][0]=1
-bodyParts[leftSidePartsIndex[1]][0][0][-1][0]=1
-bodyParts[leftSidePartsIndex[1]][0][1][0][0]=1
-bodyParts[leftSidePartsIndex[1]][0][1][1][0]=1
-bodyParts[leftSidePartsIndex[1]][0][1][-1][0]=1
-bodyParts[leftSidePartsIndex[1]][0][-1][0][0]=1
-bodyParts[leftSidePartsIndex[1]][0][-1][1][0]=1
-bodyParts[leftSidePartsIndex[1]][0][-1][-1][0]=1
--- End insert solar panel.
-
--- End insert side parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Insert the top parts.
--- If you have no top parts, be sure to set topPartsIndex[0]=false
-topPartsIndex={}
-topPartsIndex[0]=""
-
--- Insert the CuboidLandingZone.
-topPartsIndex[1]=7
-bodyParts[topPartsIndex[1]][0][0][0][4]="CuboidLandingZone.mesh"
-bodyParts[topPartsIndex[1]][0][0][0][5]="pitch=-90"
-
-bodyParts[topPartsIndex[1]][0][0][0][0]=1
-bodyParts[topPartsIndex[1]][0][0][0][2]="+-"
-bodyParts[topPartsIndex[1]][1][0][0][0]=1
-bodyParts[topPartsIndex[1]][-1][0][0][0]=1
-bodyParts[topPartsIndex[1]][0][0][1][0]=1
-bodyParts[topPartsIndex[1]][1][0][1][0]=1
-bodyParts[topPartsIndex[1]][-1][0][1][0]=1
-bodyParts[topPartsIndex[1]][0][0][2][0]=1
-bodyParts[topPartsIndex[1]][1][0][2][0]=1
-bodyParts[topPartsIndex[1]][-1][0][2][0]=1
-bodyParts[topPartsIndex[1]][0][0][3][0]=1
-bodyParts[topPartsIndex[1]][1][0][3][0]=1
-bodyParts[topPartsIndex[1]][-1][0][3][0]=1
--- End insert the CuboidLandingZone.
-
--- Insert the SatelliteDish.
-topPartsIndex[2]=8
-bodyParts[topPartsIndex[2]][0][0][0][4]="SatelliteDish.mesh"
-bodyParts[topPartsIndex[2]][0][0][0][5]="pitch=-90"
-bodyParts[topPartsIndex[2]][0][0][0][8]="rotationaxis=\"0,1,0\" rotationrate=5"
-
-bodyParts[topPartsIndex[2]][0][0][0][0]=1
-bodyParts[topPartsIndex[2]][0][0][1][0]=1
-bodyParts[topPartsIndex[2]][0][0][-1][0]=1
-bodyParts[topPartsIndex[2]][1][0][0][0]=1
-bodyParts[topPartsIndex[2]][1][0][1][0]=1
-bodyParts[topPartsIndex[2]][1][0][-1][0]=1
-bodyParts[topPartsIndex[2]][-1][0][0][0]=1
-bodyParts[topPartsIndex[2]][-1][0][1][0]=1
-bodyParts[topPartsIndex[2]][-1][0][-1][0]=1
--- End insert the SatelliteDish.
-
--- End insert the top parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Insert the connection parts, which are used to connect all the bodyparts.
--- If you're spacestation has no connection parts, be sure to set connPartsIndex[0]=false.
-connPartsIndex={}
-connPartsIndex[0]=""
-
--- Insert the CuboidConnection.
-connPartsIndex[1]=9
-bodyParts[connPartsIndex[1]][0][0][0][4]="CuboidConnection.mesh"
-bodyParts[connPartsIndex[1]][0][0][0][5]="roll=90"
-bodyParts[connPartsIndex[1]][0][0][0][6]=""
-bodyParts[connPartsIndex[1]][0][0][0][7]="pitch=90"
--- End insert the CuboidConnection.
-
--- End insert the connection parts.
-
--- End create array bodyParts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Here I define some functions which I will use later.
-
---This function actualizes the grid, which I have to call always after I have added a new part to the space station.
-function actualizeGrid(Index,x,y,z)
-	for i=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-		for j=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-			for k=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-				if bodyParts[Index][i][j][k][0] == 1 then
-					for l=0,3 do
-						grid[x+i][y+j][z+k][l] = bodyParts[Index][i][j][k][l]
-					end
-				end
-			end
-		end
-	end
-end
--- End actualizeGrid.
-
--- This function checks wheter a given parts fits at that position or not.
--- If the part fits there it returns 1, otherwise 0.
-function checkPart(Index,x,y,z)
-	check=1
-	for i=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-		for j=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-			for k=math.floor(-pDim/2)+1,math.floor(pDim/2) do
-				-- If the part occupies the position (i,j,k), the grid must be empty there ((x+i, y+j, z+k)==0), if not, check is zero,
-				--	which means that the part doesn't fit there.
-				if bodyParts[Index][i][j][k][0] == 1 and grid[x+i][y+j][z+k][0] == 1 then
-					check=0
-				end
-			end
-		end
-	end
-	return check
-end
--- End checkPart function.
-
--- This function prints the model with tempPartIndex in the bodyParts array at position lx,ly,lz.
--- If you need to rotate the model around his own axis, then you have to set movEntity true and define the details of the rotation in
---	bodyParts[tempPartIndex][0][0][0][8].
--- If your model needs to be rotated like bodyParts[tempPartIndex][0][0][0][5], then side must be 1, for bodyParts[tempPartIndex][0][0][0][6] side must be 2,
---	for bodyParts[tempPartIndex][0][0][0][7] side must be 3.
-function printModel(lx,ly,lz,tempPartIndex,movEntity,side)
-	if movEntity == true then
-		print("<MovableEntity scale=1 position=\"") print(lx*gridDim*sSScale) print(",") print(ly*gridDim*sSScale) print(",") print(lz*gridDim*sSScale) print("\" ")
-		print(bodyParts[tempPartIndex][0][0][0][8]) print(">")
-		print("<attached>")
-		lx=0 ly=0 lz=0
-	end
-
-	print("<Model position=\"") print(lx*gridDim*sSScale) print(",") print(ly*gridDim*sSScale) print(",") print(lz*gridDim*sSScale)
-	print("\" scale=") print(sSScale) print(" mesh= \"") print(bodyParts[tempPartIndex][0][0][0][4]) print("\"")
-
-		if side == 1 then
-			print(bodyParts[tempPartIndex][0][0][0][5]) print(">")
-		elseif side == 2 then
-			print(bodyParts[tempPartIndex][0][0][0][6]) print(">")
-		elseif side == 3 then
-			print(bodyParts[tempPartIndex][0][0][0][7]) print(">")
-		end
-
-		print("<attached>")
-			print(bodyParts[tempPartIndex][0][0][0][9])
-		print("</attached>")
-
-	print("</Model>")
-
-	if movEntity == true then
-		print("</attached>")
-		print("</MovableEntity>")
-	end
-end
--- End function printModel().
-
--- This function sets a part to a side of the space station.
--- The arguments lx,ly,lz are the coordinates of the grid, where you want to set the part.
--- The arguments xAxis,yAxis,zAxis can be 0 or 1, but only one argument out of the three can be 1. This means two of them must always be zero. You have to set xAxis to one,
---	if your part is attached to a side, which faces into the x-direction (negative or positive, this is later specified with Dir), that means the x-Axis is a normal vector
---	of the side to which you want to attach the part. The same for yAxis and zAxis.
--- The argument Dir must be 1 if your side, where you want to attach the part, faces into the positive direction, -1 if the side faces into the negative direction. The side
---	faces into the positive direction means, that the side of the side where the part will be attached is directed into the direction of the positive direction of the
---	corresponding axis.
--- The argument index is the index of the part for the bodyParts array.
--- The argument printMovEnt must be false if your part doesn't need to be attached to an extra MovableEntity. If your part must be attached to an extra MovableEntity
---	this argument must be true. The extra MovableEntity is used to rotate the part around his own axis, or something like that.
--- The argument printSide is like the argument side of the printModel() function. It defines how your part will be rotated. Read the commentary there.
--- The function returns 0 if the part couldn't be set, because it did not fit there or there was no side to attach the part. It returns 1 if the part is successfully set.
-function setPart(lx,ly,lz,xAxis,yAxis,zAxis,Dir,index,printMovEnt,printSide)
-
-	partSet=0
-	-- For the bodyParts array I use 1 as x-, 2 as y- and 3 as z-Axis for the definition in which directions a part can have connections.
-	coord=1*xAxis+2*yAxis+3*zAxis
-	-- If I try to attach the part from the positive direction to the side of the space station, the part of the station (where I want to attach the new part) must have
-	--	a connection into the positive direction. Otherwise I look from the negative side and so the part of the station must have a connection into the negative direction.
-	if Dir==1 then
-		conn="+"
-	elseif Dir==-1 then
-		conn="-"
-	end
-	-- I look from the direction defined through Dir, and here I check, whether I have reached a side of the space station, which means at position lx,ly,lz is nothing and
-	--	at the next position is a part which can have a connection into the direction from where I look.
-	if grid[lx][ly][lz][0] == 0 and grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][0] == 1 and (grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][coord]=="+-" or grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][coord]==conn) then
-		-- This checks whether the part fits at that position or not.
-		check=checkPart(index,lx,ly,lz)
-		if check == 1 then
-			-- This prints the part.
-			printModel(lx,ly,lz,index,printMovEnt,printSide)
-			partSet=1
-			-- This actualizes the grid array with the values of the array bodyParts at the position index.
-			actualizeGrid(index,lx,ly,lz)
-		end
-	end
-	return partSet
-end
--- End function setPart().
-
--- This function sets a part to a side of the space station. It is called spiralSet, because it starts in the middle of the side and goes out in a form of a spiral.
--- The argument xAxis,yAxis,zAxis,Dir,printMovEnt,printSide are the same as the arguments from the setPart() function, please read the commentary there.
--- The argument index here must be an array, where you define the index for your part for the bodyParts array. The first used index is 1 and goes up to parts.
--- The argument parts is the number of different parts which you want to attach to a side.
-function spiralSet(xAxis,yAxis,zAxis,Dir,index,parts,printMovEnt,printSide)
-	if index[0] ~= false then
-		-- The array vector contains the actual position where you try to set the part. vector[0],vector[1] and vector[3] contains the x,y,z-coordinate.
-		vector={}
-		-- This must be done, because there are different sides from where I try to attach a part.
-		coord1=1*yAxis+2*zAxis
-		coord2=math.mod(coord1+1,3)
-		coord3=math.mod(coord2+1,3)
-
-		for pc=1,parts do
-			tempIndex = index[pc]
-			for eachPart=1,bodyParts[tempIndex][0][0][0][10] do
-				partSet=0
-				vector[coord1]=math.floor(Dir*sSSize/2)-2*Dir
-				while vector[coord1]~=math.floor(-1*Dir*sSSize/2)+2*Dir and partSet==0 do
-					round=0
-					while round<=math.floor(sSSize/2)-2 and partSet==0 do
-						vector[coord2]=round
-						vector[coord3]=-round
-						while vector[coord3]<=round and partSet==0 do
-							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
-							vector[coord3]=vector[coord3]+1
-						end
-						while vector[coord2]>=-round and partSet==0 do
-							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
-							vector[coord2]=vector[coord2]-1
-						end
-						while vector[coord3]>-round and partSet==0 do
-							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
-							vector[coord3]=vector[coord3]-1
-						end
-						while vector[coord2]<=round and partSet==0 do
-							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
-							vector[coord2]=vector[coord2]+1
-						end
-						round=round+1
-					end
-					vector[coord1]=vector[coord1]-Dir
-				end
-			end
-		end
-	end
-end
--- End function spiralSet().
-
--- End define functions.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- This is xml code, which means now we attach some parts to the MovableEntity.
-print("<attached>")
--- End attach to the MovableEntity.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach all bodyparts.
--- Define at which position in the x-direction you're space station will start.
-x=math.random(-math.floor(xLength/2),-math.floor(xLength/2)+xVar)
--- Define at which position in the x-direction you're space station will end.
-xMax=math.random(math.floor(xLength/2),math.floor(xLength/2)+xVar)
-while x<xMax do
-	-- The same for the y- and z-direction.
-	y=math.random(-math.floor(yLength/2),-math.floor(yLength/2)+yVar)
-	yMax=math.random(math.floor(yLength/2),math.floor(yLength/2)+yVar)
-	while y<yMax do
-		yMax=math.random(math.floor(yLength/2),math.floor(yLength/2)+yVar)
-		z=math.random(-math.floor(zLength/2),-math.floor(zLength/2)+zVar)
-		zMax=math.random(math.floor(zLength/2),math.floor(zLength/2)+zVar)
-		while z<zMax do
-			-- This loop choses a bodypart, which fits at position (x,y,z).
-			-- If after the fifth time the part does still not fit we terminate the loop and set no part at postition (x,y,z).
-			partSet=0
-			counter=0
-			while counter<5 and partSet==0 do
-				-- This choses randomly a bodyPartIndex, which is the index used for the parts in the array bodyParts.
-				tempBodyPartIndex=math.random(1,sSBodyParts)
-				check=checkPart(tempBodyPartIndex,x,y,z)
-				-- If check == 1, this means that the part fits there, so we put it there and break the while true loop, to go on.
-				if check == 1 then
-					-- This prints the chosen part at position (x*gridDim*sSScale,y*gridDim*sSScale,z*gridDim*sSScale).
-					printModel(x,y,z,tempBodyPartIndex,false,1)
-					-- This actualizes the grid array with the values of the array bodyParts at the position tempBodyPartIndex, which is our randomly chosen part.
-					actualizeGrid(tempBodyPartIndex,x,y,z)
-					partSet=1
-				end
-				counter=counter+1
-			end
-			z=z+1
-		end
-		y=y+1
-	end
-	x=x+1
-end
--- End attach all bodyparts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach backParts, if there are some.
-	spiralSet(0,0,1,1,backPartsIndex,backParts,false,1)
--- End attach backParts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach frontParts, if there are.
-	spiralSet(0,0,1,-1,frontPartsIndex,frontParts,false,1)
--- End attach frontParts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach parts on the left side of the space station.
-	spiralSet(1,0,0,-1,leftSidePartsIndex,leftSideParts,true,1)
--- End attach left side parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach parts on the right side of the space station.
-	spiralSet(1,0,0,1,rightSidePartsIndex,rightSideParts,true,2)
--- End attach right side parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach parts on top of the space station.
-	spiralSet(0,1,0,1,topPartsIndex,topParts,true,1)
--- End attach top parts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Attach all connectionparts.
--- This iterates through the whole grid array.
-if connPartsIndex[0] ~= false then
-	for x=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
-		for y=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
-			for z=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
-				tempConnPartIndex=connPartsIndex[math.random(1,connParts)]
-				-- This checks whether there has to be a connection part between (x,y,z) and (x+1,y,z) or not. First it checks if there is a part at (x,y,z) and
-				--	then it checks if that part can have a connection into the positive x-direction, if it can, it checks if there is a part at (x+1,y,z) and
-				--	if that part can have a connection into the negative x-direction, if both can, it prints the xml code to set a connection part.
-				if grid[x][y][z][0]==1 and (grid[x][y][z][1]=="+" or grid[x][y][z][1]=="+-") and grid[x+1][y][z][0]==1 and (grid[x+1][y][z][1]=="-" or grid[x+1][y][z][1]=="+-") then
-					-- This prints the connection part, the +1/2 is because the connection is set exactly in the middle of two gridpoints.
-					printModel(x+1/2,y,z,tempConnPartIndex,false,1)
-				end
-				-- The same as in the x-direction, but for the y-direction.
-				if grid[x][y][z][0]==1 and ( grid[x][y][z][2]=="+" or grid[x][y][z][2]=="+-" ) and grid[x][y+1][z][0]==1 and ( grid[x][y+1][z][2]=="-" or grid[x][y+1][z][2]=="+-" ) then
-					printModel(x,y+1/2,z,tempConnPartIndex,false,2)
-				end
-				-- The same as in the x-direction, but for the z-direction.
-				if grid[x][y][z][0]==1 and ( grid[x][y][z][3]=="+" or grid[x][y][z][3]=="+-" ) and grid[x][y][z+1][0]==1 and ( grid[x][y][z+1][3]=="-" or grid[x][y][z+1][3]=="+-" ) then
-					printModel(x,y,z+1/2,tempConnPartIndex,false,3)
-				end
-			end
-		end
-	end
-end
--- End attach all connectionparts.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- This is xml code, which ends the attachment and the MovableEntity.
-print("</attached>")
-print("</MovableEntity>")
--- End ends attachment and MovableEntity.
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
-end
--- End createSpaceStationPar() function.
-
-
-
--- This function is for the lazy guys, which do not care how the space station looks like, so I use some good standard values.
-function createSpaceStation()
-	createSpaceStationPar(0,4,1,2,1,6,1,100)
-end
--- End createSpaceStaion() function.
-
-
-

Deleted: media/levels/CuboidSpaceStation.oxw
===================================================================
--- media/levels/CuboidSpaceStation.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/CuboidSpaceStation.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,112 +0,0 @@
-<?lua
-	include("levels/hudtemplates.oxw")
-?>
-
-<?lua
-	include("levels/spaceshiptemplates.oxw")
-?>
-
-<Level
-	name = "SpaceStation test Space!"
-	description = "All the new SpaceStations are created here!"
->
-	<Scene
-		ambientlight = "0.5, 0.5, 0.5"
-		skybox = "Orxonox/Starbox"
-	>
-
-
-
-<!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
-<?lua
-	dofile("../../media/levels/CuboidSpaceStation.lua")
-?>
-
-<!-- The following examples insert some space station in various ways, so I guess you will understand how to use my .lua file and the functions of it.
---->
-
-<!-- Here I add a space station at position 0,0,0 without velocity and no rotation.
---->
-<?lua
-	createSpaceStation()
-?>
-
-
-
-<!-- Here I add a space station at position 0,0,-5000 without velocity and no rotation.
---->
-<PositionableEntity scale=1 position="0,0,-5000">
-	<attached>
-		<?lua
-			createSpaceStation()
-		?>
-	</attached>
-</PositionableEntity>
-
-
-
-<!-- Here I add a space station at position 5000,0,0 with velocity 50,0,0 and a rotation so that the space station faces into the positive x-axis.
---->
-<MovableEntity scale=1 position="5000,0,0" velocity="50,0,0" yaw=-90>
-	<attached>
-		<?lua
-			createSpaceStation()
-		?>
-	</attached>
-</MovableEntity>
-
-
-
-<!-- Here I add a space station at position -5000,0,0 without velocity but rotation around his own y-axis.
---->
-<MovableEntity scale=1 position="-5000,0,0" rotationaxis="0,1,0" rotationrate=5>
-	<attached>
-		<?lua
-			createSpaceStation()
-		?>
-	</attached>
-</MovableEntity>
-
-
-
-<!-- Here I add a space station at position 10000,0,0 which will rotate around the position 0,0,0 and around his own axis in flight direction.
----- To do so, I create a MovableEntity at position 0,0,0 and attach another MovableEntity with relative coordinates to the first MovableEntity 10000,0,0.
----- I rotate the first MovableEntity, so the second Entity rotates around 0,0,0 in the x-,z-area with a radius 10000, and so does the space station,
----- because the space station is attached to the second MovableEntity with relative coordinates 0,0,0 (this is defined in the .lua file).
----- Then I rotate also the second MovableEntity around his own z-axis, so the space station rotates also around its own axis.
---->
-<MovableEntity scale=1 position="0,0,0" rotationaxis="0,1,0" rotationrate=3>
-	<attached>
-		<MovableEntity scale=1 position="10000,0,0" rotationaxis="0,0,1" rotationrate=2>
-			<attached>
-				<?lua
-					-- Here I use the createSpaceStationPar(...) function, which has 8 arguments, see the .lua file at the top to understand them.
-					createSpaceStationPar(0,2,1,2,1,2,1,50)
-				?>
-			</attached>
-		</MovableEntity>
-	</attached>
-</MovableEntity>
-
-
-
-<!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
-
-
-
-	<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=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-
-  </Scene>
-</Level>

Modified: media/levels/empty_level.oxw
===================================================================
--- media/levels/empty_level.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/empty_level.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,10 +1,11 @@
 <?lua
-  include("levels/hudtemplates.oxw")
+  include("overlay/stats.oxo")
+  include("overlay/hudtemplates3.oxo")
 ?>
 
 <?lua
-  include("levels/spaceshiptemplates.oxw")
-  include("levels/spaceshiptemplates_pirate.oxw")
+  include("levels/templates/spaceship_assff.oxt")
+  include("levels/templates/spaceship_pirate.oxt")
 ?>
 
 <Level


Property changes on: media/levels/empty_level.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: media/levels/gametype_asteroids.oxw
===================================================================
--- media/levels/gametype_asteroids.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/gametype_asteroids.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <Level
@@ -22,12 +22,12 @@
 
 <!--
 <?lua
-for i = 1, 500, 1 
+for i = 1, 500, 1
 do
 j = math.random()
 ?>
-    
-    <MovableEntity position="<?lua print(math.random()* 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=<?lua print(j * 150 + 30) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() *100) ?>" > 
+
+    <MovableEntity position="<?lua print(math.random()* 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>,<?lua print(math.random() * 10000 - 5000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=<?lua print(j * 150 + 30) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() *100) ?>" >
       <attached>
         <Model position="0,0,0" scale=<?lua print(j * 10) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
       </attached>
@@ -35,13 +35,13 @@
         <SphereCollisionShape radius="<?lua print(j * 2300 + 450) ?>" />
       </collisionShapes>
     </MovableEntity>
-<?lua 
+<?lua
 end
 ?>
 -->
 
 
-<MovableEntity position="0,0,0" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=5 collisiondamage=1 enablecollisiondamage=true> 
+<MovableEntity position="0,0,0" collisionType=dynamic linearDamping=0.8 angularDamping=0 scale=5 collisiondamage=1 enablecollisiondamage=true>
   <attached>
     <Model position="0,0,0" scale=10 mass=100 mesh="ast1.mesh" />
   </attached>
@@ -54,20 +54,20 @@
 <ForceField position="0,-500,0" direction="0,1,0" diameter=500 velocity=70>
   <attached>
     <ParticleEmitter source="Orxonox/ForceFieldPurple" startdelay=0 />
-  </attached>         
+  </attached>
  </ForceField>
- 
 
+
  <ForceField position="1000,-500,0" direction="0,1,1" diameter=500 velocity=30>
   <attached>
     <ParticleEmitter source="Orxonox/ForceFieldGreen" startdelay=0 />
-  </attached>         
+  </attached>
  </ForceField>
- 
+
  <ForceField position="1800,-300,-300" direction="0,0,1" diameter=800 velocity=100>
   <attached>
     <ParticleEmitter source="Orxonox/ForceFieldBlue" startdelay=0 />
-  </attached>         
+  </attached>
  </ForceField>
 
 


Property changes on: media/levels/gametype_asteroids.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: media/levels/gametype_underattack.oxw
===================================================================
--- media/levels/gametype_underattack.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/gametype_underattack.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <Level
@@ -16,15 +16,15 @@
     <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, 30, 1 do ?>
-        <MovableEntity 
+        <MovableEntity
             position="<?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>"
             velocity="<?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>"
         >
             <attached>
                 <Model
                     <?lua x = math.random() * 150 + 30 ?>
-                    scale="<?lua print(x) ?>" 
-                    mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" 
+                    scale="<?lua print(x) ?>"
+                    mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh"
                     position="0,0,0"
                 />
             </attached>
@@ -33,7 +33,7 @@
             </collisionShapes>
         </MovableEntity>
     <?lua end ?>
-        
+
     <Destroyer
         position          = "100,150,0"
         collisionType     = dynamic
@@ -41,96 +41,96 @@
         velocity          = "-35,0,0"
         angularDamping    = 0.9999999
         health            = 10000
-        maxhealth         = 10000          
+        maxhealth         = 10000
         initialhealth     = 10000
     >
 
         <attached>
-            <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="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 
+                <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
                 />
 
-                <!--more spawnpoints for team1-->             
+                <!--more spawnpoints for team1-->
                 <!--
-                <TeamSpawnPoint 
-                    team=1 position="<?lua print((math.random() * 500 + 500)) ?>,<?lua print((math.random() * 500 + 500) ) ?>,<?lua print((math.random() * 500 + 500)) ?>" 
-                    lookat="0,0,0" 
-                    spawnclass=SpaceShip 
-                    pawndesign=spaceshipassff 
+                <TeamSpawnPoint
+                    team=1 position="<?lua print((math.random() * 500 + 500)) ?>,<?lua print((math.random() * 500 + 500) ) ?>,<?lua print((math.random() * 500 + 500)) ?>"
+                    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
+                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
                 />
 
-                <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"
             />
-            <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"  
+            <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>     
+        </attached>
         <collisionShapes>
             <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
             <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />


Property changes on: media/levels/gametype_underattack.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Deleted: media/levels/hudtemplates.oxw
===================================================================
--- media/levels/hudtemplates.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/hudtemplates.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,62 +0,0 @@
-<OverlayGroup name = "chatoverlay" scale = "1, 1">
-  <ChatOverlay
-   name     = "chat"
-   position = "0.03, 0.5"
-   font     = "VeraMono"
-   caption  = ""
-   textSize = 0.025
-  />
-</OverlayGroup>
-
-<Template name="spectatorhud">
-  <OverlayGroup name = "spectatorhud" scale = "1, 1">
-    <OverlayText
-     name     = "state"
-     position = "0.5, 0.85"
-     font     = "VeraMono"
-     caption  = "Press [Fire] to start the match"
-     textSize = 0.05
-     colour   = "1.0, 1.0, 0.0, 0.8"
-     align    = "center"
-    />
-  </OverlayGroup>
-</Template>
-
-<Template name="spaceshiphud">
-  <OverlayGroup name = "HUD" scale = "1, 1">
-    <HUDSpeedBar
-     name       = "SpeedBar1"
-     background = "Orxonox/BarBackground"
-     size       = "0.35, 0.05"
-     position   = "0.0 , 1.0 "
-     pickPoint  = "0, 1"
-     value      = 0
-    >
-      <BarColour position = 0.7 colour = "0.2,0.7,0.2" />
-      <BarColour position = 0.4 colour = "0.7,0.5,0.2" />
-      <BarColour position = 0.1 colour = "0.7,0.2,0.2" />
-    </HUDSpeedBar>
-
-    <HUDNavigation
-     name          = "Navigation"
-     correctAspect = true
-     font          = "Monofur"
-     textSize      = 0.05
-     navMarkerSize = 0.03
-     aimMarkerSize = 0.04
-    />
-
-    <HUDRadar
-     name          = "Radar"
-     background    = "Orxonox/Radar"
-     correctAspect = true
-     size          = "0.17, 0.17"
-     position      = "0.5, 1.0"
-     pickPoint     = "0.5, 1.0"
-     rotation      = 0
-     sensitivity   = 1.0
-     halfDotSizeDistance = 3000
-     maximumDotSize      = 0.1
-    />
-  </OverlayGroup>
-</Template>

Deleted: media/levels/hudtemplates3.oxw
===================================================================
--- media/levels/hudtemplates3.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/hudtemplates3.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,99 +0,0 @@
-<!--
-<Template name="defaultHUD">
-  <OverlayGroup name = "defaultHUD" scale = "1, 1">
-    <ChatOverlay
-     name     = "chat"
-     position = "0.03, 0.5"
-     font     = "VeraMono"
-     caption  = ""
-     textsize = 0.025
-    />
-
-    <GametypeStatus
-     name     = "state"
-     position = "0.5, 0.85"
-     font     = "VeraMono"
-     textsize = 0.05
-     colour   = "1.0, 1.0, 0.0, 0.8"
-     align    = "center"
-    />
-  </OverlayGroup>
-</Template>
--->
-
-<Template name="spectatorhud">
-  <OverlayGroup name = "spectatorhud" scale = "1, 1">
-  </OverlayGroup>
-</Template>
-
-<Template name="spaceshiphud">
-  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
-
-    <HUDHealthBar
-     name              = "HealthBar1"
-     background        = "Orxonox/HealthBarBackground"
-     size              = "0.35, 0.0875"
-     position          = "0.0 , 0.95 "
-     pickpoint         = "0, 1"
-     bartexture        = "healthbar_bar.tga"
-     textfont          = "VeraMono"
-     textusebarcolour  = true
-     textsize          = 0.039
-     textoffset        = "0.315, 0.05"
-     textpickpoint     = "0, 0"
-     textalign         = "right"
-     correctaspect     = false
-     textcorrectaspect = false
-    >
-      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
-      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
-      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
-    </HUDHealthBar>
-
-    <HUDSpeedBar
-     name          = "SpeedBar1"
-     background    = "Orxonox/BarBackground"
-     size          = "0.35, 0.05"
-     position      = "0.0 , 1.0 "
-     pickpoint     = "0, 1"
-     correctaspect = false
-    >
-      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
-      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
-      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
-    </HUDSpeedBar>
-
-    <HUDNavigation
-     name          = "Navigation"
-     correctaspect = true
-     font          = "Monofur"
-     textsize      = 0.05
-     navMarkerSize = 0.03
-     aimMarkerSize = 0.04
-    />
-
-    <HUDRadar
-     name          = "Radar"
-     background    = "Orxonox/Radar"
-     correctaspect = true
-     size          = "0.17, 0.17"
-     position      = "1.0, 1.0"
-     pickpoint     = "1.0, 1.0"
-     rotation      = 0
-     sensitivity   = 1.0
-     halfDotSizeDistance = 3000
-     maximumDotSize      = 0.1
-    />
-
-    <HUDTimer
-     name     = "Timer"
-     position = "0.5, 0.85"
-     font     = "VeraMono"
-     textsize = 0.1
-     colour   = "1.0, 1.0, 0.0, 0.8"
-     align    = "center"
-    />
-
-  </OverlayGroup>
-</Template>

Copied: media/levels/includes/CuboidSpaceStation.lua (from rev 2152, media/levels/CuboidSpaceStation.lua)
===================================================================
--- media/levels/includes/CuboidSpaceStation.lua	                        (rev 0)
+++ media/levels/includes/CuboidSpaceStation.lua	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,678 @@
+----------------------------------------------------------------------------------------------------
+-- This lua script creates a totally random generated space station for the orxonox computer game!--
+-- (c) Wallah 2008, published under GPL licence!												  --
+----------------------------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- IMPORTANT: If you need more parameters, do the following: copy the actual function (just the headline and the end statement) to the end of the file,			  --
+-- like I did with createSpaceStation() and let that function call the new function where you can modify the parameters. For all parameters which the old function--
+-- doesn't have you just give the standard default values, which I have defined. This is to make sure, that anyone else who uses the old function can still use it--
+-- the same way he/she always did. If you want a function with less parameters, just create a new one at the end of the file and call this function with some	  --
+-- default values. REMEMBER: Function overloading is not possible, be sure to call your function differently from others already existing ones.					  --
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+-- This function creates a randomly generated space station.
+-- The first argument ranSeed, must be 0, or a positive Integer, if it is 0 your space station is always chosen randomly, if you give an integer,
+--	your space station will be generated randomly, but once you have the space station it will always be the same.
+-- The argument xLength defines how large the space station will be into the x-direction.
+-- The argument xVar defines how much the space station will vary at the ends in x-direction, this is so that the station is no cube.
+-- The argument yLength is the same as xLength, but for the y-direction.
+-- The argument yVar is the same as xLength, but for the y-direction.
+-- The argument zLength is the same as xLength, but for the z-direction.
+-- The argument zVar is the same as xLength, but for the z-direction.
+-- The argument sSScale scales the station proportionally in all directions.
+function createSpaceStationPar(ranSeed, xLength, xVar, yLength, yVar, zLength, zVar, sSScale)
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- This prints xml code, which creates a MovableEntity, which I need to attach all the parts of the space station.
+print("<MovableEntity scale=1 position=\"0,0,0\" >")
+-- End create Movable Entity.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Create a randomseed, so that the math.random() function is actually random.
+if ranSeed == 0 then
+	math.randomseed(os.time())
+else
+	math.randomseed(ranSeed)
+end
+-- End create randomseed.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Here you can define some global variables, with which you can modify the space station.
+
+-- Define the maximal size of the grid, this value is based on how large you define the area of bodyparts plus 20 gridpoints for attachparts.
+sSSize=30
+if xLength>=yLength and xLength>=zLength then
+	sSSize=xLength+20
+elseif yLength>=xLength and yLength>=zLength then
+	sSSize=yLength+20
+elseif zLength>=xLength and zLength>=yLength then
+	sSSize=zLength+20
+end
+-- Define how many parts the space station has, this value has to be exact, so be sure to increment it if you're adding a new part.
+sSParts=9
+-- Define how many body parts the space station has, this value has to be exact. Body part means a part, which has connections at least in two directions.
+sSBodyParts=3
+-- Define how many frontParts you have.
+frontParts=1
+-- Define how many backParts you have.
+backParts=1
+-- Define how many side parts for the left side you have.
+leftSideParts=1
+-- Define how many side parts for the right side you have.
+rightSideParts=1
+-- Define how many top parts you have.
+topParts=2
+-- Define how many connection parts you have.
+connParts=1
+-- Define the maximal dimension of a single part, be sure this value is big enough, better it's too big, it's only a matter of efficiency.
+-- It should be at least 1 bigger than the biggest part needs, because I guarantee that it works with odd numbers, to do so I use the math.floor function.
+pDim=6
+-- Define the griddimension, be sure this value matches the size of a single space station part plus the size of a connection part, which means your parts must be:
+--	integer*(gridDim-connectionSize), then integer tells you how many griddimensions your part is.
+gridDim=2.25
+-- End define global parameters.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- This creates a 4-dimensional grid, which tells us if there is a part or not, and in which direction it has connections.
+-- The parameters x,y,z are the axis of the space station, which iterate to sSSize, the maximal size of the space station.
+-- The griddimension, this word I will use later, means that the distance of a point to the next point is gridDim in the game, so the absolute x-axis is x*gridDim*sSScale,
+--	and so on for the other dimensions y and z.
+-- grid[x][y][z][0] contains 0 if there is no part at the position (x,y,z), otherwise 1.
+-- grid[x][y][z][1] contains 0 if there is no connection from (x,y,z) in x-direction, "+" if there is one in the positive x-direction,
+--	"-" if there is one in the negative x-direction, "+-" if there are in both x-directions.
+-- grid[x][y][z][2] contains 0 if there is no connection from (x,y,z) in y-direction, "+" if there is one in the positive y-direction,
+--	"-" if there is one in the negative y-direction, "+-" if there are in both y-directions.
+-- grid[x][y][z][3] contains 0 if there is no connection from (x,y,z) in z-direction, "+" if there is one in the positive z-direction,
+--	"-" if there is one in the negative z-direction, "+-" if there are in both z-directions.
+grid = {}
+for x=-math.floor(sSSize/2),math.floor(sSSize/2) do
+	grid[x] = {}
+	for y=-math.floor(sSSize/2),math.floor(sSSize/2) do
+		grid[x][y]= {}
+		for z=-math.floor(sSSize/2),math.floor(sSSize/2) do
+			grid[x][y][z]={}
+			for i=0,3 do
+				grid[x][y][z][i]=0
+			end
+		end
+	end
+end
+-- End create 4-dim grid.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- This creates an array which stores all the parts, it's size is depending on the global values pDim and sSParts.
+-- The first parameter i, tells us how many parts fit into the array, so it iterates from 1 to sSParts, each part has his own value i.
+-- The second, third and fourth parameters are the relative coordinates of the part, you have to start at (0,0,0) and be sure you fill the array into the right direction.
+--	A short example: your part is 2 griddimensions long and you place it in the game, that the relative coordinate point is at (0,0,0) and the part lies in the positive
+--	z-axis, then you have to use the coordinate point (0,0,1).
+-- The fifth parameter is an array with size 4, at index=0, you have to set 1 if your part covers the gridpoint at (x,y,z), otherwise 0.
+--	At index=1,2,3 you define the possible connection directions (1 for x, 2 for y and 3 for z), be sure to use the notation from above (0, "+-", "+", "-").
+bodyParts={}
+for i=1,sSParts do
+	bodyParts[i]={}
+	for x=-math.floor(pDim/2),math.floor(pDim/2) do
+		bodyParts[i][x]={}
+		for y=-math.floor(pDim/2),math.floor(pDim/2) do
+			bodyParts[i][x][y]={}
+			for z=-math.floor(pDim/2),math.floor(pDim/2) do
+				bodyParts[i][x][y][z]={}
+				for k=0,3 do
+					bodyParts[i][x][y][z][k]=0
+				end
+			end
+		end
+	end
+	-- This contains the name of the mesh file.
+	bodyParts[i][0][0][0][4]=""
+	-- This contains the first possible rotation of your part, pitch=... yaw=... roll=... .
+	bodyParts[i][0][0][0][5]=""
+	-- This contains the second possible rotation of your part, pitch=... yaw=... roll=... .
+	bodyParts[i][0][0][0][6]=""
+	-- This contains the third possible rotation of your part, pitch=... yaw=... roll=... .
+	bodyParts[i][0][0][0][7]=""
+	-- Contains the movement rotation, rotationaxis=... rotationrate=... .
+	bodyParts[i][0][0][0][8]=""
+	-- Contains the attachment, if your part has an attachment, e.g. <ParticleEmitter .../>.
+	bodyParts[i][0][0][0][9]=""
+	-- Contains how many of this part you want to attach to your space station.
+	bodyParts[i][0][0][0][10]=1
+end
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Here you can add a part to the space station, there are some examples here and how to describe your part is written above in the commentary.
+
+-- The part must be inserted so, that the center of reference is at position (0,0,0).
+-- At position bodyParts[i][0][0][0][4] you have to put the mesh name of your part.
+-- At bodyParts[i][0][0][0][5] you can rotate your part, with pitch=angle, yaw=angle or roll=angle (x,y or z). Positive angle means in screw direction.
+-- At bodyParts[i][0][0][0][6] you have another possibility to rotate your part in a different way, e.g. for left and right side parts.
+-- At bodyParts[i][0][0][0][7] you have a third possibility to rotate your part, e.g. connection parts must be rotated into 3 different ways.
+-- At bodyParts[i][0][0][0][8] you can rotate your part around his own axis, with rotationaxis="x,y,z" rotationrate=number.
+-- At bodyParts[i][0][0][0][9] you can attach something to your model, e.g. <ParticleEmitter .../>.
+
+-- Insert the CuboidBody, which is only one griddimension and can have connections in every direction.
+bodyParts[1][0][0][0][4]="CuboidBody.mesh"
+
+bodyParts[1][0][0][0][0]=1
+bodyParts[1][0][0][0][1]="+-"
+bodyParts[1][0][0][0][2]="+-"
+bodyParts[1][0][0][0][3]="+-"
+-- End insert CuboidBody.
+
+-- Insert the DoubleCuboidBody, which is two griddimensions long, and one wide and high and can have connections in every direction except in the middle.
+bodyParts[2][0][0][0][4]="DoubleCuboidBody.mesh"
+bodyParts[2][0][0][0][5]="pitch=-90"
+
+bodyParts[2][0][0][0][0]=1
+bodyParts[2][0][0][0][1]="+-"
+bodyParts[2][0][0][0][2]="+-"
+bodyParts[2][0][0][0][3]="-"
+
+bodyParts[2][0][0][1][0]=1
+bodyParts[2][0][0][1][1]="+-"
+bodyParts[2][0][0][1][2]="+-"
+bodyParts[2][0][0][1][3]="+"
+-- End insert DoubleCuboidBody.
+
+-- Insert the CuboidConnectionBody, it is three griddimensions long and one wide and high and can have only connections at griddimension 1
+--	(except the side in direction of griddimension 2) and griddimension 3 (except the side in direction of griddimension 2).
+bodyParts[3][0][0][0][4]="CuboidConnBody.mesh"
+bodyParts[3][0][0][0][5]="pitch=-90"
+
+bodyParts[3][0][0][0][0]=1
+bodyParts[3][0][0][0][1]="+-"
+bodyParts[3][0][0][0][2]="+-"
+bodyParts[3][0][0][0][3]="-"
+
+bodyParts[3][0][0][1][0]=1
+
+bodyParts[3][0][0][2][0]=1
+bodyParts[3][0][0][2][1]="+-"
+bodyParts[3][0][0][2][2]="+-"
+bodyParts[3][0][0][2][3]="+"
+-- End insert CuboidConnectionBody.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Insert the back parts.
+-- If you're space station has no back parts, be sure to set backPartsIndex[0]=false.
+backPartsIndex={}
+backPartsIndex[0]=""
+
+-- Insert the thruster, which is one griddimension long, two wide and high, it can only have a connection into the negative z-direction.
+backPartsIndex[1]=4
+bodyParts[backPartsIndex[1]][0][0][0][4]="Thruster.mesh"
+bodyParts[backPartsIndex[1]][0][0][0][5]="pitch=-90"
+bodyParts[backPartsIndex[1]][0][0][0][9]="<ParticleEmitter position=\"0,-0.5,0\" source=\"Orxonox/ThrusterFire\" />"
+bodyParts[backPartsIndex[1]][0][0][0][10]=5
+
+bodyParts[backPartsIndex[1]][0][0][0][0]=1
+bodyParts[backPartsIndex[1]][0][0][0][3]="-"
+bodyParts[backPartsIndex[1]][1][0][0][0]=1
+bodyParts[backPartsIndex[1]][-1][0][0][0]=1
+bodyParts[backPartsIndex[1]][0][1][0][0]=1
+bodyParts[backPartsIndex[1]][0][-1][0][0]=1
+-- End insert the thruster.
+
+-- End insert the back parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Insert the front parts. If your space station has no front parts, be sure to set frontPartsIndex[0]=false.
+frontPartsIndex={}
+frontPartsIndex[0]=""
+
+-- The SemiCircleCockpit is 3 x-griddimensions long, 3 y-griddimensions and 2 z-griddimensions, it can only have a connection in the positive z-direction.
+frontPartsIndex[1]=5
+bodyParts[frontPartsIndex[1]][0][0][0][4]="SemiCircleCockpit.mesh"
+bodyParts[frontPartsIndex[1]][0][0][0][5]="pitch=-90 yaw=180"
+bodyParts[frontPartsIndex[1]][0][0][0][9]="<Billboard scale=0.01 position=\"0,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" /> <Billboard scale=0.01 position=\"0.5,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" /> <Billboard scale=0.01 position=\"-0.5,-0.1,2.2\" colour=\"1.0,1.0,1.0\" material=\"Examples/Flare\" />"
+
+bodyParts[frontPartsIndex[1]][0][0][0][0]=1
+bodyParts[frontPartsIndex[1]][0][0][0][3]="+"
+
+bodyParts[frontPartsIndex[1]][-1][0][0][0]=1
+bodyParts[frontPartsIndex[1]][1][0][0][0]=1
+bodyParts[frontPartsIndex[1]][0][-1][0][0]=1
+bodyParts[frontPartsIndex[1]][0][1][0][0]=1
+bodyParts[frontPartsIndex[1]][-1][-1][0][0]=1
+bodyParts[frontPartsIndex[1]][1][-1][0][0]=1
+bodyParts[frontPartsIndex[1]][-1][1][0][0]=1
+bodyParts[frontPartsIndex[1]][1][1][0][0]=1
+bodyParts[frontPartsIndex[1]][0][0][-1][0]=1
+bodyParts[frontPartsIndex[1]][-1][0][-1][0]=1
+bodyParts[frontPartsIndex[1]][1][0][-1][0]=1
+bodyParts[frontPartsIndex[1]][0][-1][-1][0]=1
+bodyParts[frontPartsIndex[1]][0][1][-1][0]=1
+bodyParts[frontPartsIndex[1]][-1][-1][-1][0]=1
+bodyParts[frontPartsIndex[1]][1][-1][-1][0]=1
+bodyParts[frontPartsIndex[1]][-1][1][-1][0]=1
+bodyParts[frontPartsIndex[1]][1][1][-1][0]=1
+-- End insert SemiCircleCockpit.
+
+-- End insert the front parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Insert the side parts.
+-- If your space station has no left side parts, be sure to set leftsidePartsIndex[0]=false.
+-- If your space station has no right side parts, be sure to set rightsidePartsIndex[0]=false.
+leftSidePartsIndex={}
+leftSidePartsIndex[0]=""
+rightSidePartsIndex={}
+rightSidePartsIndex[0]=""
+
+-- Insert the solar panel, which i wanna use as left and right side part.
+leftSidePartsIndex[1]=6
+rightSidePartsIndex[1]=leftSidePartsIndex[1]
+bodyParts[leftSidePartsIndex[1]][0][0][0][4]="SolarPanel.mesh"
+bodyParts[leftSidePartsIndex[1]][0][0][0][5]="roll=90 pitch="..math.random(0,180)
+bodyParts[rightSidePartsIndex[1]][0][0][0][6]="roll=-90 pitch="..math.random(0,180)
+bodyParts[rightSidePartsIndex[1]][0][0][0][8]="rotationaxis=\"1,0,0\" rotationrate=2"
+bodyParts[leftSidePartsIndex[1]][0][0][0][0]=1
+bodyParts[leftSidePartsIndex[1]][0][0][1][0]=1
+bodyParts[leftSidePartsIndex[1]][0][0][-1][0]=1
+bodyParts[leftSidePartsIndex[1]][0][1][0][0]=1
+bodyParts[leftSidePartsIndex[1]][0][1][1][0]=1
+bodyParts[leftSidePartsIndex[1]][0][1][-1][0]=1
+bodyParts[leftSidePartsIndex[1]][0][-1][0][0]=1
+bodyParts[leftSidePartsIndex[1]][0][-1][1][0]=1
+bodyParts[leftSidePartsIndex[1]][0][-1][-1][0]=1
+-- End insert solar panel.
+
+-- End insert side parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Insert the top parts.
+-- If you have no top parts, be sure to set topPartsIndex[0]=false
+topPartsIndex={}
+topPartsIndex[0]=""
+
+-- Insert the CuboidLandingZone.
+topPartsIndex[1]=7
+bodyParts[topPartsIndex[1]][0][0][0][4]="CuboidLandingZone.mesh"
+bodyParts[topPartsIndex[1]][0][0][0][5]="pitch=-90"
+
+bodyParts[topPartsIndex[1]][0][0][0][0]=1
+bodyParts[topPartsIndex[1]][0][0][0][2]="+-"
+bodyParts[topPartsIndex[1]][1][0][0][0]=1
+bodyParts[topPartsIndex[1]][-1][0][0][0]=1
+bodyParts[topPartsIndex[1]][0][0][1][0]=1
+bodyParts[topPartsIndex[1]][1][0][1][0]=1
+bodyParts[topPartsIndex[1]][-1][0][1][0]=1
+bodyParts[topPartsIndex[1]][0][0][2][0]=1
+bodyParts[topPartsIndex[1]][1][0][2][0]=1
+bodyParts[topPartsIndex[1]][-1][0][2][0]=1
+bodyParts[topPartsIndex[1]][0][0][3][0]=1
+bodyParts[topPartsIndex[1]][1][0][3][0]=1
+bodyParts[topPartsIndex[1]][-1][0][3][0]=1
+-- End insert the CuboidLandingZone.
+
+-- Insert the SatelliteDish.
+topPartsIndex[2]=8
+bodyParts[topPartsIndex[2]][0][0][0][4]="SatelliteDish.mesh"
+bodyParts[topPartsIndex[2]][0][0][0][5]="pitch=-90"
+bodyParts[topPartsIndex[2]][0][0][0][8]="rotationaxis=\"0,1,0\" rotationrate=5"
+
+bodyParts[topPartsIndex[2]][0][0][0][0]=1
+bodyParts[topPartsIndex[2]][0][0][1][0]=1
+bodyParts[topPartsIndex[2]][0][0][-1][0]=1
+bodyParts[topPartsIndex[2]][1][0][0][0]=1
+bodyParts[topPartsIndex[2]][1][0][1][0]=1
+bodyParts[topPartsIndex[2]][1][0][-1][0]=1
+bodyParts[topPartsIndex[2]][-1][0][0][0]=1
+bodyParts[topPartsIndex[2]][-1][0][1][0]=1
+bodyParts[topPartsIndex[2]][-1][0][-1][0]=1
+-- End insert the SatelliteDish.
+
+-- End insert the top parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Insert the connection parts, which are used to connect all the bodyparts.
+-- If you're spacestation has no connection parts, be sure to set connPartsIndex[0]=false.
+connPartsIndex={}
+connPartsIndex[0]=""
+
+-- Insert the CuboidConnection.
+connPartsIndex[1]=9
+bodyParts[connPartsIndex[1]][0][0][0][4]="CuboidConnection.mesh"
+bodyParts[connPartsIndex[1]][0][0][0][5]="roll=90"
+bodyParts[connPartsIndex[1]][0][0][0][6]=""
+bodyParts[connPartsIndex[1]][0][0][0][7]="pitch=90"
+-- End insert the CuboidConnection.
+
+-- End insert the connection parts.
+
+-- End create array bodyParts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Here I define some functions which I will use later.
+
+--This function actualizes the grid, which I have to call always after I have added a new part to the space station.
+function actualizeGrid(Index,x,y,z)
+	for i=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+		for j=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+			for k=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+				if bodyParts[Index][i][j][k][0] == 1 then
+					for l=0,3 do
+						grid[x+i][y+j][z+k][l] = bodyParts[Index][i][j][k][l]
+					end
+				end
+			end
+		end
+	end
+end
+-- End actualizeGrid.
+
+-- This function checks wheter a given parts fits at that position or not.
+-- If the part fits there it returns 1, otherwise 0.
+function checkPart(Index,x,y,z)
+	check=1
+	for i=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+		for j=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+			for k=math.floor(-pDim/2)+1,math.floor(pDim/2) do
+				-- If the part occupies the position (i,j,k), the grid must be empty there ((x+i, y+j, z+k)==0), if not, check is zero,
+				--	which means that the part doesn't fit there.
+				if bodyParts[Index][i][j][k][0] == 1 and grid[x+i][y+j][z+k][0] == 1 then
+					check=0
+				end
+			end
+		end
+	end
+	return check
+end
+-- End checkPart function.
+
+-- This function prints the model with tempPartIndex in the bodyParts array at position lx,ly,lz.
+-- If you need to rotate the model around his own axis, then you have to set movEntity true and define the details of the rotation in
+--	bodyParts[tempPartIndex][0][0][0][8].
+-- If your model needs to be rotated like bodyParts[tempPartIndex][0][0][0][5], then side must be 1, for bodyParts[tempPartIndex][0][0][0][6] side must be 2,
+--	for bodyParts[tempPartIndex][0][0][0][7] side must be 3.
+function printModel(lx,ly,lz,tempPartIndex,movEntity,side)
+	if movEntity == true then
+		print("<MovableEntity scale=1 position=\"") print(lx*gridDim*sSScale) print(",") print(ly*gridDim*sSScale) print(",") print(lz*gridDim*sSScale) print("\" ")
+		print(bodyParts[tempPartIndex][0][0][0][8]) print(">")
+		print("<attached>")
+		lx=0 ly=0 lz=0
+	end
+
+	print("<Model position=\"") print(lx*gridDim*sSScale) print(",") print(ly*gridDim*sSScale) print(",") print(lz*gridDim*sSScale)
+	print("\" scale=") print(sSScale) print(" mesh= \"") print(bodyParts[tempPartIndex][0][0][0][4]) print("\"")
+
+		if side == 1 then
+			print(bodyParts[tempPartIndex][0][0][0][5]) print(">")
+		elseif side == 2 then
+			print(bodyParts[tempPartIndex][0][0][0][6]) print(">")
+		elseif side == 3 then
+			print(bodyParts[tempPartIndex][0][0][0][7]) print(">")
+		end
+
+		print("<attached>")
+			print(bodyParts[tempPartIndex][0][0][0][9])
+		print("</attached>")
+
+	print("</Model>")
+
+	if movEntity == true then
+		print("</attached>")
+		print("</MovableEntity>")
+	end
+end
+-- End function printModel().
+
+-- This function sets a part to a side of the space station.
+-- The arguments lx,ly,lz are the coordinates of the grid, where you want to set the part.
+-- The arguments xAxis,yAxis,zAxis can be 0 or 1, but only one argument out of the three can be 1. This means two of them must always be zero. You have to set xAxis to one,
+--	if your part is attached to a side, which faces into the x-direction (negative or positive, this is later specified with Dir), that means the x-Axis is a normal vector
+--	of the side to which you want to attach the part. The same for yAxis and zAxis.
+-- The argument Dir must be 1 if your side, where you want to attach the part, faces into the positive direction, -1 if the side faces into the negative direction. The side
+--	faces into the positive direction means, that the side of the side where the part will be attached is directed into the direction of the positive direction of the
+--	corresponding axis.
+-- The argument index is the index of the part for the bodyParts array.
+-- The argument printMovEnt must be false if your part doesn't need to be attached to an extra MovableEntity. If your part must be attached to an extra MovableEntity
+--	this argument must be true. The extra MovableEntity is used to rotate the part around his own axis, or something like that.
+-- The argument printSide is like the argument side of the printModel() function. It defines how your part will be rotated. Read the commentary there.
+-- The function returns 0 if the part couldn't be set, because it did not fit there or there was no side to attach the part. It returns 1 if the part is successfully set.
+function setPart(lx,ly,lz,xAxis,yAxis,zAxis,Dir,index,printMovEnt,printSide)
+
+	partSet=0
+	-- For the bodyParts array I use 1 as x-, 2 as y- and 3 as z-Axis for the definition in which directions a part can have connections.
+	coord=1*xAxis+2*yAxis+3*zAxis
+	-- If I try to attach the part from the positive direction to the side of the space station, the part of the station (where I want to attach the new part) must have
+	--	a connection into the positive direction. Otherwise I look from the negative side and so the part of the station must have a connection into the negative direction.
+	if Dir==1 then
+		conn="+"
+	elseif Dir==-1 then
+		conn="-"
+	end
+	-- I look from the direction defined through Dir, and here I check, whether I have reached a side of the space station, which means at position lx,ly,lz is nothing and
+	--	at the next position is a part which can have a connection into the direction from where I look.
+	if grid[lx][ly][lz][0] == 0 and grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][0] == 1 and (grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][coord]=="+-" or grid[lx+(-1*xAxis*Dir)][ly+(-1*yAxis*Dir)][lz+(-1*zAxis*Dir)][coord]==conn) then
+		-- This checks whether the part fits at that position or not.
+		check=checkPart(index,lx,ly,lz)
+		if check == 1 then
+			-- This prints the part.
+			printModel(lx,ly,lz,index,printMovEnt,printSide)
+			partSet=1
+			-- This actualizes the grid array with the values of the array bodyParts at the position index.
+			actualizeGrid(index,lx,ly,lz)
+		end
+	end
+	return partSet
+end
+-- End function setPart().
+
+-- This function sets a part to a side of the space station. It is called spiralSet, because it starts in the middle of the side and goes out in a form of a spiral.
+-- The argument xAxis,yAxis,zAxis,Dir,printMovEnt,printSide are the same as the arguments from the setPart() function, please read the commentary there.
+-- The argument index here must be an array, where you define the index for your part for the bodyParts array. The first used index is 1 and goes up to parts.
+-- The argument parts is the number of different parts which you want to attach to a side.
+function spiralSet(xAxis,yAxis,zAxis,Dir,index,parts,printMovEnt,printSide)
+	if index[0] ~= false then
+		-- The array vector contains the actual position where you try to set the part. vector[0],vector[1] and vector[3] contains the x,y,z-coordinate.
+		vector={}
+		-- This must be done, because there are different sides from where I try to attach a part.
+		coord1=1*yAxis+2*zAxis
+		coord2=math.mod(coord1+1,3)
+		coord3=math.mod(coord2+1,3)
+
+		for pc=1,parts do
+			tempIndex = index[pc]
+			for eachPart=1,bodyParts[tempIndex][0][0][0][10] do
+				partSet=0
+				vector[coord1]=math.floor(Dir*sSSize/2)-2*Dir
+				while vector[coord1]~=math.floor(-1*Dir*sSSize/2)+2*Dir and partSet==0 do
+					round=0
+					while round<=math.floor(sSSize/2)-2 and partSet==0 do
+						vector[coord2]=round
+						vector[coord3]=-round
+						while vector[coord3]<=round and partSet==0 do
+							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
+							vector[coord3]=vector[coord3]+1
+						end
+						while vector[coord2]>=-round and partSet==0 do
+							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
+							vector[coord2]=vector[coord2]-1
+						end
+						while vector[coord3]>-round and partSet==0 do
+							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
+							vector[coord3]=vector[coord3]-1
+						end
+						while vector[coord2]<=round and partSet==0 do
+							partSet=setPart(vector[0],vector[1],vector[2],xAxis,yAxis,zAxis,Dir,tempIndex,printMovEnt,printSide)
+							vector[coord2]=vector[coord2]+1
+						end
+						round=round+1
+					end
+					vector[coord1]=vector[coord1]-Dir
+				end
+			end
+		end
+	end
+end
+-- End function spiralSet().
+
+-- End define functions.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- This is xml code, which means now we attach some parts to the MovableEntity.
+print("<attached>")
+-- End attach to the MovableEntity.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach all bodyparts.
+-- Define at which position in the x-direction you're space station will start.
+x=math.random(-math.floor(xLength/2),-math.floor(xLength/2)+xVar)
+-- Define at which position in the x-direction you're space station will end.
+xMax=math.random(math.floor(xLength/2),math.floor(xLength/2)+xVar)
+while x<xMax do
+	-- The same for the y- and z-direction.
+	y=math.random(-math.floor(yLength/2),-math.floor(yLength/2)+yVar)
+	yMax=math.random(math.floor(yLength/2),math.floor(yLength/2)+yVar)
+	while y<yMax do
+		yMax=math.random(math.floor(yLength/2),math.floor(yLength/2)+yVar)
+		z=math.random(-math.floor(zLength/2),-math.floor(zLength/2)+zVar)
+		zMax=math.random(math.floor(zLength/2),math.floor(zLength/2)+zVar)
+		while z<zMax do
+			-- This loop choses a bodypart, which fits at position (x,y,z).
+			-- If after the fifth time the part does still not fit we terminate the loop and set no part at postition (x,y,z).
+			partSet=0
+			counter=0
+			while counter<5 and partSet==0 do
+				-- This choses randomly a bodyPartIndex, which is the index used for the parts in the array bodyParts.
+				tempBodyPartIndex=math.random(1,sSBodyParts)
+				check=checkPart(tempBodyPartIndex,x,y,z)
+				-- If check == 1, this means that the part fits there, so we put it there and break the while true loop, to go on.
+				if check == 1 then
+					-- This prints the chosen part at position (x*gridDim*sSScale,y*gridDim*sSScale,z*gridDim*sSScale).
+					printModel(x,y,z,tempBodyPartIndex,false,1)
+					-- This actualizes the grid array with the values of the array bodyParts at the position tempBodyPartIndex, which is our randomly chosen part.
+					actualizeGrid(tempBodyPartIndex,x,y,z)
+					partSet=1
+				end
+				counter=counter+1
+			end
+			z=z+1
+		end
+		y=y+1
+	end
+	x=x+1
+end
+-- End attach all bodyparts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach backParts, if there are some.
+	spiralSet(0,0,1,1,backPartsIndex,backParts,false,1)
+-- End attach backParts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach frontParts, if there are.
+	spiralSet(0,0,1,-1,frontPartsIndex,frontParts,false,1)
+-- End attach frontParts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach parts on the left side of the space station.
+	spiralSet(1,0,0,-1,leftSidePartsIndex,leftSideParts,true,1)
+-- End attach left side parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach parts on the right side of the space station.
+	spiralSet(1,0,0,1,rightSidePartsIndex,rightSideParts,true,2)
+-- End attach right side parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach parts on top of the space station.
+	spiralSet(0,1,0,1,topPartsIndex,topParts,true,1)
+-- End attach top parts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- Attach all connectionparts.
+-- This iterates through the whole grid array.
+if connPartsIndex[0] ~= false then
+	for x=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
+		for y=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
+			for z=math.floor(-sSSize/2)+2,math.floor(sSSize/2)-2 do
+				tempConnPartIndex=connPartsIndex[math.random(1,connParts)]
+				-- This checks whether there has to be a connection part between (x,y,z) and (x+1,y,z) or not. First it checks if there is a part at (x,y,z) and
+				--	then it checks if that part can have a connection into the positive x-direction, if it can, it checks if there is a part at (x+1,y,z) and
+				--	if that part can have a connection into the negative x-direction, if both can, it prints the xml code to set a connection part.
+				if grid[x][y][z][0]==1 and (grid[x][y][z][1]=="+" or grid[x][y][z][1]=="+-") and grid[x+1][y][z][0]==1 and (grid[x+1][y][z][1]=="-" or grid[x+1][y][z][1]=="+-") then
+					-- This prints the connection part, the +1/2 is because the connection is set exactly in the middle of two gridpoints.
+					printModel(x+1/2,y,z,tempConnPartIndex,false,1)
+				end
+				-- The same as in the x-direction, but for the y-direction.
+				if grid[x][y][z][0]==1 and ( grid[x][y][z][2]=="+" or grid[x][y][z][2]=="+-" ) and grid[x][y+1][z][0]==1 and ( grid[x][y+1][z][2]=="-" or grid[x][y+1][z][2]=="+-" ) then
+					printModel(x,y+1/2,z,tempConnPartIndex,false,2)
+				end
+				-- The same as in the x-direction, but for the z-direction.
+				if grid[x][y][z][0]==1 and ( grid[x][y][z][3]=="+" or grid[x][y][z][3]=="+-" ) and grid[x][y][z+1][0]==1 and ( grid[x][y][z+1][3]=="-" or grid[x][y][z+1][3]=="+-" ) then
+					printModel(x,y,z+1/2,tempConnPartIndex,false,3)
+				end
+			end
+		end
+	end
+end
+-- End attach all connectionparts.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-- This is xml code, which ends the attachment and the MovableEntity.
+print("</attached>")
+print("</MovableEntity>")
+-- End ends attachment and MovableEntity.
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+
+
+end
+-- End createSpaceStationPar() function.
+
+
+
+-- This function is for the lazy guys, which do not care how the space station looks like, so I use some good standard values.
+function createSpaceStation()
+	createSpaceStationPar(0,4,1,2,1,6,1,100)
+end
+-- End createSpaceStaion() function.
+
+
+


Property changes on: media/levels/includes/CuboidSpaceStation.lua
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Added: media/levels/includes/weaponsettings1.oxi
===================================================================
--- media/levels/includes/weaponsettings1.oxi	                        (rev 0)
+++ media/levels/includes/weaponsettings1.oxi	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,39 @@
+    <weaponslots>
+      <WeaponSlot position="-15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack firemode=0>
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+      <WeaponPack firemode=1>
+        <Fusion
+            position="0,0,0"
+            munitionType="FusionMunition"
+            bulletLoadingTime="0.3"
+            magazineLoadingTime="3"
+            speed="600"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+    </weapons>


Property changes on: media/levels/includes/weaponsettings1.oxi
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/includes/weaponsettings2.oxi
===================================================================
--- media/levels/includes/weaponsettings2.oxi	                        (rev 0)
+++ media/levels/includes/weaponsettings2.oxi	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,46 @@
+    <weaponslots>
+      <WeaponSlot position="-15,-0.5,0" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="15,-.5,0" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="195"/>
+            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="165"/>
+            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
+          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </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,-20" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>


Property changes on: media/levels/includes/weaponsettings2.oxi
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/includes/weaponsettings_H2.oxi
===================================================================
--- media/levels/includes/weaponsettings_H2.oxi	                        (rev 0)
+++ media/levels/includes/weaponsettings_H2.oxi	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,46 @@
+    <weaponslots>
+      <WeaponSlot position=" 12.1, 3, 9" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="-12.2, 3, 9" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="120"/>
+            <Model mesh="hs-w01s.mesh" roll="120" position="0.1,0.5,0" scale="0.5"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="-120" scale3D="-1,1,1"/>
+            <Model mesh="hs-w01s.mesh" roll="-120" position="-0.1,0.5,0" scale="0.5"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
+          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </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,-20" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>


Property changes on: media/levels/includes/weaponsettings_H2.oxi
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/includes/weaponsettings_pirate.oxi
===================================================================
--- media/levels/includes/weaponsettings_pirate.oxi	                        (rev 0)
+++ media/levels/includes/weaponsettings_pirate.oxi	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,28 @@
+    <weaponslots>
+      <WeaponSlot position=" 4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="-4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack firemode=0>
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+    </weapons>


Property changes on: media/levels/includes/weaponsettings_pirate.oxi
___________________________________________________________________
Added: svn:eol-style
   + native

Copied: media/levels/old/CuboidSpaceStation.oxw (from rev 2152, media/levels/CuboidSpaceStation.oxw)
===================================================================
--- media/levels/old/CuboidSpaceStation.oxw	                        (rev 0)
+++ media/levels/old/CuboidSpaceStation.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,112 @@
+<?lua
+	include("overlay/hudtemplates3.oxo")
+?>
+
+<?lua
+	include("levels/templates/spaceship_assff.oxt")
+?>
+
+<Level
+	name = "SpaceStation test Space!"
+	description = "All the new SpaceStations are created here!"
+>
+	<Scene
+		ambientlight = "0.5, 0.5, 0.5"
+		skybox = "Orxonox/Starbox"
+	>
+
+
+
+<!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+<?lua
+	dofile("../../media/levels/includes/CuboidSpaceStation.lua")
+?>
+
+<!-- The following examples insert some space station in various ways, so I guess you will understand how to use my .lua file and the functions of it.
+--->
+
+<!-- Here I add a space station at position 0,0,0 without velocity and no rotation.
+--->
+<?lua
+	createSpaceStation()
+?>
+
+
+
+<!-- Here I add a space station at position 0,0,-5000 without velocity and no rotation.
+--->
+<PositionableEntity scale=1 position="0,0,-5000">
+	<attached>
+		<?lua
+			createSpaceStation()
+		?>
+	</attached>
+</PositionableEntity>
+
+
+
+<!-- Here I add a space station at position 5000,0,0 with velocity 50,0,0 and a rotation so that the space station faces into the positive x-axis.
+--->
+<MovableEntity scale=1 position="5000,0,0" velocity="50,0,0" yaw=-90>
+	<attached>
+		<?lua
+			createSpaceStation()
+		?>
+	</attached>
+</MovableEntity>
+
+
+
+<!-- Here I add a space station at position -5000,0,0 without velocity but rotation around his own y-axis.
+--->
+<MovableEntity scale=1 position="-5000,0,0" rotationaxis="0,1,0" rotationrate=5>
+	<attached>
+		<?lua
+			createSpaceStation()
+		?>
+	</attached>
+</MovableEntity>
+
+
+
+<!-- Here I add a space station at position 10000,0,0 which will rotate around the position 0,0,0 and around his own axis in flight direction.
+---- To do so, I create a MovableEntity at position 0,0,0 and attach another MovableEntity with relative coordinates to the first MovableEntity 10000,0,0.
+---- I rotate the first MovableEntity, so the second Entity rotates around 0,0,0 in the x-,z-area with a radius 10000, and so does the space station,
+---- because the space station is attached to the second MovableEntity with relative coordinates 0,0,0 (this is defined in the .lua file).
+---- Then I rotate also the second MovableEntity around his own z-axis, so the space station rotates also around its own axis.
+--->
+<MovableEntity scale=1 position="0,0,0" rotationaxis="0,1,0" rotationrate=3>
+	<attached>
+		<MovableEntity scale=1 position="10000,0,0" rotationaxis="0,0,1" rotationrate=2>
+			<attached>
+				<?lua
+					-- Here I use the createSpaceStationPar(...) function, which has 8 arguments, see the .lua file at the top to understand them.
+					createSpaceStationPar(0,2,1,2,1,2,1,50)
+				?>
+			</attached>
+		</MovableEntity>
+	</attached>
+</MovableEntity>
+
+
+
+<!-------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
+
+
+
+	<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=spaceshipassff />
+              </trigger>
+            </events>
+          </EventTrigger>
+        </spawn>
+      </events>
+    </ParticleSpawner>
+
+  </Scene>
+</Level>


Property changes on: media/levels/old/CuboidSpaceStation.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/physicstest.oxw (from rev 2152, media/levels/physicstest.oxw)
===================================================================
--- media/levels/old/physicstest.oxw	                        (rev 0)
+++ media/levels/old/physicstest.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,19 @@
+<Ambient colourvalue="0.8, 0.8, 0.8" />
+<Skybox src="Orxonox/Starbox" />
+<SpaceShip camera="true" position="50,0,0" scale="10" yawpitchroll="0,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
+
+<HelloBullet/>
+
+
+<?lua
+for i = 1, 226, 1 
+do ?>
+  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
+<?lua 
+end
+?>


Property changes on: media/levels/old/physicstest.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/physicstest2.oxw (from rev 2152, media/levels/physicstest2.oxw)
===================================================================
--- media/levels/old/physicstest2.oxw	                        (rev 0)
+++ media/levels/old/physicstest2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,280 @@
+<?lua
+  include("levels/old/spaceshiptemplates_physics.oxw")
+?>
+<?lua
+  include("overlay/hudtemplates3.oxo")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+   negativeWorldRange = "(-100000, -100000, -100000)"
+   positiveWorldRange = "( 100000,  100000,  100000)"
+   hasPhysics   = true
+  >
+      <!--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"
+     name            = "banana"
+     collisionType   = "static"
+     mass            = 1000
+    >
+      <attached>
+        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
+        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
+      </attached>
+      <collisionShapes>
+        <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
+      </collisionShapes>
+	</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-->
+
+    <MovableEntity
+     name            = "blubb"
+     position        = "-150, 20, -500"
+     collisionType   = "kinematic"
+     mass            = 10000
+     velocity        = "30, 0, 0"
+    >
+      <attached>
+        <Model name = "moedeli" position="0,0,0" scale=20 mesh="sphere.mesh" />
+        <StaticEntity name="hahaha" position="0,0,0" collisionType="static">
+          <collisionShapes>
+            <SphereCollisionShape name="firstSphere" radius=20/>
+          </collisionShapes>
+        </StaticEntity>
+      </attached>
+
+      <!--attached>
+        <SphereCollisionShape name = "secondSphere" radius=0.4 position="1,1,1"/>
+        <CompoundCollisionShape position="4,4,4">
+          <SphereCollisionShape name = "thirdSphere" radius=1.0/>
+        </CompoundCollisionShape>
+      </attached-->
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "blubb2"
+     position        = "150, 30, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <StaticEntity
+     name            = "blubbStatic"
+     position        = "0, 15, -500"
+     collisionType   = "Static"
+     mass            = 10
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </StaticEntity>
+
+    <!--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 /-->
+
+    <MovableEntity
+     name            = "apple1"
+     position        = "-150, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "apple2"
+     position        = "50, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="1,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "apple3"
+     position        = "150, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </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/fire3" />
+                  </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-->
+
+
+    <!--ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
+    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 /-->
+
+
+    <ParticleSpawner position="0,20,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+        <spawn>
+          <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="0,20,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=false>
+      <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 name=fireright />
+        <EventTarget name=firecenter />
+        <EventTarget name=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>


Property changes on: media/levels/old/physicstest2.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/planettest.oxw (from rev 2152, media/levels/planettest.oxw)
===================================================================
--- media/levels/old/planettest.oxw	                        (rev 0)
+++ media/levels/old/planettest.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,38 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+?>
+
+<?lua
+  include("levels/templates/spaceship_assff.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+  >
+
+    <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>
+    </ParticleSpawner>
+
+
+    <Planet position="2500,0,-9000" scale=1000 pitch=-90 mesh="earth.mesh" rotationaxis="0,0,1" rotationrate="0.1" atmospheresize=130.0f imagesize=1024.0f />
+    <Planet position="0,0,-5001" scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
+
+  </Scene>
+</Level>


Property changes on: media/levels/old/planettest.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/presentation_physics.oxw (from rev 2152, media/levels/presentation_physics.oxw)
===================================================================
--- media/levels/old/presentation_physics.oxw	                        (rev 0)
+++ media/levels/old/presentation_physics.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,109 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+  include("overlay/stats.oxo")
+  include("levels/templates/spaceship_assff.oxt")
+  math.randomseed(344)
+?>
+
+<Level
+ name         = "Physics"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.8, 0.8, 0.8"
+   skybox       = "Orxonox/skypanoramagen1"
+   gravity      = "0, -10, 0"
+  >
+    <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" />
+
+    <StaticEntity
+     position        = "0,0,0"
+     name            = "floor"
+     collisionType   = "static"
+     friction        = 1
+    >
+      <attached>
+        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
+        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
+      </attached>
+      <collisionShapes>
+        <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
+      </collisionShapes>
+	</StaticEntity>
+
+	<MovableEntity
+     position        = "0,250,500"
+     rotationaxis    = "1, 1, 1"
+     rotationrate    = 360
+     velocity        = "0, 0, -80"
+     name            = "ship"
+     collisionType   = "dynamic"
+     friction        = 0.5
+     mass            = 500
+     restitution     = 0
+    >
+      <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 />
+
+        <!--Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+        <Model position="0,0,0" scale3D="10, 3, 5" mesh="cube.mesh" />
+        <Model position="13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
+        <Model position="-13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
+        <Model position="0,0,7" scale3D="3, 2, 2" mesh="cube.mesh" />
+        <Model position="0,0.1,-11" scale3D="2.2, 1.8, 6" mesh="cube.mesh" />
+        <Model position="0,0.1,-19" scale3D="1.4, 1, 2" mesh="cube.mesh" /-->
+      </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>
+	</MovableEntity>
+
+    <?lua
+    for i = -20, 20, 8
+    do
+      for i2 = -20, 20, 8
+      do
+        for i3 = -20, 20, 8
+        do ?>
+        <MovableEntity
+         position="<?lua print(i)?>, <?lua print(i3 + 250)?>, <?lua print(i2) ?>"
+         collisionType = "dynamic"
+         mass = 1
+         restitution = 0
+         friction = 0.5
+        >
+          <attached>
+            <Model position="0,0,0" scale=2 mesh="cube.mesh" />
+          </attached>
+          <collisionShapes>
+            <BoxCollisionShape halfExtents="2, 2, 2" />
+          </collisionShapes>
+        </MovableEntity>
+    <?lua
+        end
+      end
+    end
+    ?>
+
+    <ParticleSpawner position="-100,170,30" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+        <spawn>
+          <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="-100,170,30" spawnclass=SpaceShip pawndesign=spaceshipassff />
+              </trigger>
+            </events>
+          </EventTrigger>
+        </spawn>
+      </events>
+    </ParticleSpawner>
+  </Scene>
+</Level>


Property changes on: media/levels/old/presentation_physics.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/princessaeryn.oxw (from rev 2152, media/levels/princessaeryn.oxw)
===================================================================
--- media/levels/old/princessaeryn.oxw	                        (rev 0)
+++ media/levels/old/princessaeryn.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,315 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+  include("overlay/stats.oxo")
+  include("levels/templates/spaceship_assff.oxt")
+?>
+
+<?lua
+	dofile("../../media/levels/includes/CuboidSpaceStation.lua")
+?>
+
+<NotificationQueue
+	name  = "notification"
+	position = "1.0, 1.0"
+	targets = "questsystem"
+/>
+
+<Level
+ name         = "The Tale of Princess Aeryn"
+ description  = "The Tale of Princess Aeryn"
+>
+    <Scene
+        ambientlight = "0.3, 0.3, 0.3"
+        skybox       = "Orxonox/skypanoramagen1"
+    >
+      <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" />
+
+        <Template name=turboitem baseclass=Turbo>
+          <Turbo
+            playerclass=SpaceShip
+            duration=15
+          />
+        </Template>
+
+        <ParticleSpawner position="200,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <PickupSpawner position="200,0,-500" distance=50 respawntimer=25 item=turboitem>
+                <attached>
+                  <Model mesh="sphere.mesh" scale=3 />
+                  <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale=0.5 />
+                </attached>
+              </PickupSpawner>
+            </spawn>
+          </events>
+        </ParticleSpawner>
+
+        <Template name=turboequipment baseclass=Turbo>
+          <Turbo
+            playerclass=SpaceShip
+            duration=0
+          />
+        </Template>
+
+        <ParticleSpawner position="400,0,-1000" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <PickupSpawner position="400,0,-1000" distance=50 respawntimer=25 item=turboequipment>
+                <attached>
+                  <Model mesh="sphere.mesh" scale=3 />
+                  <Billboard material="Examples/Flare" colour="1.0, 0.5, 0.3" scale=0.5 />
+                </attached>
+              </PickupSpawner>
+            </spawn>
+          </events>
+        </ParticleSpawner>
+
+        <!-- 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="ControllableEntity" />
+                </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="ControllableEntity" />
+                        </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="ControllableEntity" />
+                                </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="ControllableEntity" />
+                        </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="ControllableEntity" />
+                        </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="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+            <!-- Trail -->
+            <EventDispatcher>
+                <targets>
+                    <EventTarget name=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="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+    </Scene>
+</Level>
+


Property changes on: media/levels/old/princessaeryn.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/questsystem.oxw (from rev 2152, media/levels/questsystem.oxw)
===================================================================
--- media/levels/old/questsystem.oxw	                        (rev 0)
+++ media/levels/old/questsystem.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,115 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+  include("overlay/stats.oxo")
+  include("levels/templates/spaceship_assff.oxt")
+?>
+
+<NotificationQueue
+	name  = "notification"
+	position = "1.0, 1.0"
+	targets = "all"
+/>
+
+<Level
+ name         = "Questsystem"
+ description  = "Just a few tests"
+>
+    <Scene
+    ambientlight = "0.5, 0.5, 0.5"
+    skybox       = "Orxonox/Starbox"
+    >
+
+        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
+            <QuestDescription title="The Main QUest" description="This is the main quest hooray. Solve it!" failMessage="You fail. Looser." completeMessage="You Win." />
+            <hints>
+                <QuestHint id="022a859d-08dd-4eac-a085-c28c29c06d48">
+                    <QuestDescription title="The super Hint." description="Be proud of yourself." />
+                </QuestHint>
+            </hints>
+        </GlobalQuest>
+
+				<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>
+				</ParticleSpawner>
+
+        <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>
+


Property changes on: media/levels/old/questsystem.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/sample4.oxw (from rev 2152, media/levels/sample4.oxw)
===================================================================
--- media/levels/old/sample4.oxw	                        (rev 0)
+++ media/levels/old/sample4.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,160 @@
+<?lua
+  include("overlay/hudtemplates3.oxo")
+?>
+
+<?lua
+  include("levels/templates/spaceship_assff.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+  >
+    <!--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 /-->
+
+    <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" />
+        <PositionableEntity 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/fire3" />
+                  </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>
+        </PositionableEntity>
+        <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>
+
+
+    <ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
+    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
+
+
+    <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>
+    </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=false>
+      <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 name=fireright />
+        <EventTarget name=firecenter />
+        <EventTarget name=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>


Property changes on: media/levels/old/sample4.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/spaceshiptemplates_physics.oxw (from rev 2152, media/levels/spaceshiptemplates_physics.oxw)
===================================================================
--- media/levels/old/spaceshiptemplates_physics.oxw	                        (rev 0)
+++ media/levels/old/spaceshiptemplates_physics.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,87 @@
+<Template name=spaceshipassff>
+  <SpaceShip
+   camerapositiontemplate = spaceshipassffcameras
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 10;
+   
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.999
+   name              = "blubbbeliblubb"
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
+      <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 />
+      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
+    </attached>
+    <collisionShapes>
+      <!--SphereCollisionShape position="0,0,0"      radius=20 /-->
+      <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>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,10,40" />
+      <CameraPosition position="0,150,-25" pitch=-90 />
+      <CameraPosition position="0,0,-30" yaw=180 />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 />
+      <CameraPosition position="50,5,-8" yaw=90 />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<!--Template name=spaceshippirate>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+    </attached>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+    </attached>
+  </SpaceShip>
+</Template-->


Property changes on: media/levels/old/spaceshiptemplates_physics.oxw
___________________________________________________________________
Added: svn:mergeinfo
   + 
Added: svn:eol-style
   + native

Copied: media/levels/old/tutorial_hs08.oxw (from rev 2152, media/levels/tutorial_hs08.oxw)
===================================================================
--- media/levels/old/tutorial_hs08.oxw	                        (rev 0)
+++ media/levels/old/tutorial_hs08.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,26 @@
+<Ambient colourvalue="0.8, 0.8, 0.8" />
+<Skybox src="Orxonox/Starbox" />
+
+<!-- This is your own space ship. The complicated XML values are not important -->
+<TutorialShip
+    camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0"
+
+SpecialEffects="true"
+
+/>
+
+<!-- A few models flying around -->
+<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
+
+<!-- Embedded lua code (creates random asteroids) -->
+<?lua
+for i = 1, 226, 1 
+do ?>
+  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
+<?lua 
+end
+?>

Deleted: media/levels/physicstest.oxw
===================================================================
--- media/levels/physicstest.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/physicstest.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,19 +0,0 @@
-<Ambient colourvalue="0.8, 0.8, 0.8" />
-<Skybox src="Orxonox/Starbox" />
-<SpaceShip camera="true" position="50,0,0" scale="10" yawpitchroll="0,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
-<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
-
-<HelloBullet/>
-
-
-<?lua
-for i = 1, 226, 1 
-do ?>
-  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua 
-end
-?>

Deleted: media/levels/physicstest2.oxw
===================================================================
--- media/levels/physicstest2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/physicstest2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,280 +0,0 @@
-<?lua
-  include("levels/spaceshiptemplates_physics.oxw")
-?>
-<?lua
-  include("levels/hudtemplates.oxw")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-   negativeWorldRange = "(-100000, -100000, -100000)"
-   positiveWorldRange = "( 100000,  100000,  100000)"
-   hasPhysics   = true
-  >
-      <!--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"
-     name            = "banana"
-     collisionType   = "static"
-     mass            = 1000
-    >
-      <attached>
-        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
-        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
-      </attached>
-      <collisionShapes>
-        <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
-      </collisionShapes>
-	</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-->
-    
-    <MovableEntity
-     name            = "blubb"
-     position        = "-150, 20, -500"
-     collisionType   = "kinematic"
-     mass            = 10000
-     velocity        = "30, 0, 0"
-    >
-      <attached>
-        <Model name = "moedeli" position="0,0,0" scale=20 mesh="sphere.mesh" />
-        <StaticEntity name="hahaha" position="0,0,0" collisionType="static">
-          <collisionShapes>
-            <SphereCollisionShape name="firstSphere" radius=20/>
-          </collisionShapes>
-        </StaticEntity>
-      </attached>
-      
-      <!--attached>
-        <SphereCollisionShape name = "secondSphere" radius=0.4 position="1,1,1"/>
-        <CompoundCollisionShape position="4,4,4">
-          <SphereCollisionShape name = "thirdSphere" radius=1.0/>
-        </CompoundCollisionShape>
-      </attached-->
-    </MovableEntity>
-  
-    <MovableEntity
-     name            = "blubb2"
-     position        = "150, 30, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-    
-    <StaticEntity
-     name            = "blubbStatic"
-     position        = "0, 15, -500"
-     collisionType   = "Static"
-     mass            = 10
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </StaticEntity>
-    
-    <!--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 /-->
-  
-    <MovableEntity
-     name            = "apple1"
-     position        = "-150, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-  
-    <MovableEntity
-     name            = "apple2"
-     position        = "50, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="1,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-  
-    <MovableEntity
-     name            = "apple3"
-     position        = "150, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </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/fire3" />
-                  </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-->
-
-
-    <!--ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 /-->
-
-
-    <ParticleSpawner position="0,20,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,20,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=false>
-      <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 name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=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>

Modified: media/levels/pickuptest.oxw
===================================================================
--- media/levels/pickuptest.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/pickuptest.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,38 +1,38 @@
-<?lua
-  include("levels/hudtemplates3.oxw")
-  include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
-?>
-
-<Level
- name         = "Presentation"
- description  = "A simple testlevel"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    
-    <Template name="jumpTest" baseclass="Jump">
-        <Jump velocity="0,0,500" jumpsAvailable="1" guiImage="decal.jpg" guiText="TEST" />
-    </Template>
-    <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" />
-
-    <PickupSpawner item="jumpTest" triggerDistance="20" respawnTime="2" position="100, 0, 0">
-        <attached>
-            <Model mesh="sphere.mesh" scale="3.0" />
-            <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale="0.5" />
-        </attached>
-    </PickupSpawner>
-    
-    <SpawnPoint position="200,200,200" lookat="100,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>
-  </Scene>
-</Level>
+<?lua
+  include("overlay/hudtemplates3.oxo")
+  include("overlay/stats.oxo")
+  include("levels/templates/spaceship_assff.oxt")
+?>
+
+<Level
+ name         = "Presentation"
+ description  = "A simple testlevel"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+
+    <Template name="jumpTest" baseclass="Jump">
+        <Jump velocity="0,0,500" jumpsAvailable="1" guiImage="decal.jpg" guiText="TEST" />
+    </Template>
+    <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" />
+
+    <PickupSpawner item="jumpTest" triggerDistance="20" respawnTime="2" position="100, 0, 0">
+        <attached>
+            <Model mesh="sphere.mesh" scale="3.0" />
+            <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale="0.5" />
+        </attached>
+    </PickupSpawner>
+
+    <SpawnPoint position="200,200,200" lookat="100,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>
+  </Scene>
+</Level>


Property changes on: media/levels/pickuptest.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Deleted: media/levels/planettest.oxw
===================================================================
--- media/levels/planettest.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/planettest.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,38 +0,0 @@
-<?lua
-  include("levels/hudtemplates.oxw")
-?>
-
-<?lua
-  include("levels/spaceshiptemplates.oxw")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-  >
-
-    <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>
-    </ParticleSpawner>
-
-
-    <Planet position="2500,0,-9000" scale=1000 pitch=-90 mesh="earth.mesh" rotationaxis="0,0,1" rotationrate="0.1" atmospheresize=130.0f imagesize=1024.0f />
-    <Planet position="0,0,-5001" scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
-
-  </Scene>
-</Level>

Deleted: media/levels/ponghud.oxw
===================================================================
--- media/levels/ponghud.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/ponghud.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,70 +0,0 @@
-<Template name="PongHUD">
-  <OverlayGroup name="PongHUD" scale = "1, 1">
-    <PongScore
-     position  = "0.05, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-
-     showleftplayer  = true
-     showrightplayer = false
-     showname        = true
-     showscore       = false
-    />
-
-    <PongScore
-     position  = "0.49, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "right"
-
-     showleftplayer  = true
-     showrightplayer = false
-     showname        = false
-     showscore       = true
-    />
-
-    <OverlayText
-     position  = "0.505, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "center"
-
-     caption   = ":"
-    />
-
-    <PongScore
-     position  = "0.51, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-
-     showleftplayer  = false
-     showrightplayer = true
-     showname        = false
-     showscore       = true
-    />
-
-    <PongScore
-     position  = "0.95, 0.05"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.06
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "right"
-
-     showleftplayer  = false
-     showrightplayer = true
-     showname        = true
-     showscore       = false
-    />
-  </OverlayGroup>
-</Template>

Modified: media/levels/presentation.oxw
===================================================================
--- media/levels/presentation.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/presentation.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <Level
@@ -18,14 +18,14 @@
     <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>

Modified: media/levels/presentation_dm.oxw
===================================================================
--- media/levels/presentation_dm.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/presentation_dm.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,8 +1,8 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
-  include("levels/spaceship_H2.oxw")
+  include("levels/templates/spaceship_assff.oxt")
+  include("levels/templates/spaceship_H2.oxt")
 ?>
 
 <Level
@@ -20,10 +20,10 @@
 
 
 <?lua
-for i = 1, 10, 1 
+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 
+<?lua
 end
 ?>
     <Model position="1,2,3" mesh="cube.mesh" />
@@ -39,12 +39,12 @@
 
 
 <?lua
-for i = 1, 50, 1 
+for i = 1, 50, 1
 do
 j = math.random()
 ?>
-    
-    <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 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) ?>"> 
+
+    <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 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) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
       </attached>
@@ -52,13 +52,13 @@
         <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
       </collisionShapes>
     </MovableEntity>
-<?lua 
+<?lua
 end
 ?>
 
 <!--
 <?lua
-for i = 1, 70, 1 
+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>
@@ -92,7 +92,7 @@
       <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
     </attached>
   </MovableEntity>
-<?lua 
+<?lua
 end
 ?>
 -->

Deleted: media/levels/presentation_physics.oxw
===================================================================
--- media/levels/presentation_physics.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/presentation_physics.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,109 +0,0 @@
-<?lua
-  include("levels/hudtemplates3.oxw")
-  include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
-  math.randomseed(344)
-?>
-
-<Level
- name         = "Physics"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.8, 0.8, 0.8"
-   skybox       = "Orxonox/skypanoramagen1"
-   gravity      = "0, -10, 0"
-  >
-    <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" />
-
-    <StaticEntity
-     position        = "0,0,0"
-     name            = "floor"
-     collisionType   = "static"
-     friction        = 1
-    >
-      <attached>
-        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
-        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
-      </attached>
-      <collisionShapes>
-        <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
-      </collisionShapes>
-	</StaticEntity>
-    
-	<MovableEntity
-     position        = "0,250,500"
-     rotationaxis    = "1, 1, 1"
-     rotationrate    = 360
-     velocity        = "0, 0, -80"
-     name            = "ship"
-     collisionType   = "dynamic"
-     friction        = 0.5
-     mass            = 500
-     restitution     = 0
-    >
-      <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 />
-        
-        <!--Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-        <Model position="0,0,0" scale3D="10, 3, 5" mesh="cube.mesh" />
-        <Model position="13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
-        <Model position="-13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
-        <Model position="0,0,7" scale3D="3, 2, 2" mesh="cube.mesh" />
-        <Model position="0,0.1,-11" scale3D="2.2, 1.8, 6" mesh="cube.mesh" />
-        <Model position="0,0.1,-19" scale3D="1.4, 1, 2" mesh="cube.mesh" /-->
-      </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>
-	</MovableEntity>
-    
-    <?lua
-    for i = -20, 20, 8
-    do
-      for i2 = -20, 20, 8
-      do
-        for i3 = -20, 20, 8
-        do ?>
-        <MovableEntity
-         position="<?lua print(i)?>, <?lua print(i3 + 250)?>, <?lua print(i2) ?>"
-         collisionType = "dynamic"
-         mass = 1
-         restitution = 0
-         friction = 0.5
-        >
-          <attached>
-            <Model position="0,0,0" scale=2 mesh="cube.mesh" />
-          </attached>
-          <collisionShapes>
-            <BoxCollisionShape halfExtents="2, 2, 2" />
-          </collisionShapes>
-        </MovableEntity>
-    <?lua
-        end
-      end
-    end
-    ?>
-
-    <ParticleSpawner position="-100,170,30" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="-100,170,30" spawnclass=SpaceShip pawndesign=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-  </Scene>
-</Level>

Modified: media/levels/presentation_pong.oxw
===================================================================
--- media/levels/presentation_pong.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/presentation_pong.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/ponghud.oxw")
+  include("overlay/ponghud.oxo")
 ?>
 
 <Template name=pongbatcameras defaults=0>
@@ -48,10 +48,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" />
 
 <?lua
-for i = 1, 10, 1 
+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" />
-<?lua 
+<?lua
 end
 ?>
 
@@ -90,7 +90,7 @@
   </EventDispatcher>
 
   <?lua
-    dofile("../../media/levels/CuboidSpaceStation.lua")
+    dofile("../../media/levels/includes/CuboidSpaceStation.lua")
   ?>
 
   <StaticEntity pitch=15>
@@ -141,7 +141,7 @@
   </StaticEntity>
 
 <?lua
-for i = 1, 10, 1 
+for i = 1, 10, 1
 do ?>
   <MovableEntity position="<?lua print(math.random() * 600 - 300)?>, <?lua print(math.random() * 600 - 300) ?>, <?lua print(math.random() * 100 + 300) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
     <attached>
@@ -175,7 +175,7 @@
       <Model scale="<?lua print(math.random() * 10 + 5) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
     </attached>
   </MovableEntity>
-<?lua 
+<?lua
 end
 ?>
 

Deleted: media/levels/princessaeryn.oxw
===================================================================
--- media/levels/princessaeryn.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/princessaeryn.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,315 +0,0 @@
-<?lua
-  include("levels/hudtemplates3.oxw")
-  include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
-?>
-
-<?lua
-	dofile("../../media/levels/CuboidSpaceStation.lua")
-?>
-
-<NotificationQueue
-	name  = "notification"
-	position = "1.0, 1.0"
-	targets = "questsystem"
-/>
-
-<Level
- name         = "The Tale of Princess Aeryn"
- description  = "The Tale of Princess Aeryn"
->
-    <Scene
-        ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skypanoramagen1"
-    >
-      <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" />
-
-        <Template name=turboitem baseclass=Turbo>
-          <Turbo
-            playerclass=SpaceShip
-            duration=15
-          />
-        </Template>
-
-        <ParticleSpawner position="200,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <PickupSpawner position="200,0,-500" distance=50 respawntimer=25 item=turboitem>
-                <attached>
-                  <Model mesh="sphere.mesh" scale=3 />
-                  <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale=0.5 />
-                </attached>
-              </PickupSpawner>
-            </spawn>
-          </events>
-        </ParticleSpawner>
-
-        <Template name=turboequipment baseclass=Turbo>
-          <Turbo
-            playerclass=SpaceShip
-            duration=0
-          />
-        </Template>
-
-        <ParticleSpawner position="400,0,-1000" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <PickupSpawner position="400,0,-1000" distance=50 respawntimer=25 item=turboequipment>
-                <attached>
-                  <Model mesh="sphere.mesh" scale=3 />
-                  <Billboard material="Examples/Flare" colour="1.0, 0.5, 0.3" scale=0.5 />
-                </attached>
-              </PickupSpawner>
-            </spawn>
-          </events>
-        </ParticleSpawner>
-
-        <!-- 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="ControllableEntity" />
-                </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="ControllableEntity" />
-                        </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="ControllableEntity" />
-                                </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="ControllableEntity" />
-                        </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="ControllableEntity" />
-                        </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="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-	      
-            <!-- Trail -->
-            <EventDispatcher>
-                <targets>
-                    <EventTarget name=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="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-
-    </Scene>
-</Level>
-

Deleted: media/levels/questsystem.oxw
===================================================================
--- media/levels/questsystem.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/questsystem.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,115 +0,0 @@
-<?lua
-  include("levels/hudtemplates3.oxw")
-  include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
-?>
-
-<NotificationQueue
-	name  = "notification"
-	position = "1.0, 1.0"
-	targets = "all"
-/>
-
-<Level
- name         = "Questsystem"
- description  = "Just a few tests"
->
-    <Scene
-    ambientlight = "0.5, 0.5, 0.5"
-    skybox       = "Orxonox/Starbox"
-    >
-
-        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
-            <QuestDescription title="The Main QUest" description="This is the main quest hooray. Solve it!" failMessage="You fail. Looser." completeMessage="You Win." />
-            <hints>
-                <QuestHint id="022a859d-08dd-4eac-a085-c28c29c06d48">
-                    <QuestDescription title="The super Hint." description="Be proud of yourself." />
-                </QuestHint>
-            </hints>
-        </GlobalQuest>
-        
-				<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>
-				</ParticleSpawner>
-
-        <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: media/levels/sample.oxw
===================================================================
--- media/levels/sample.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/sample.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,66 +0,0 @@
-<!--?lua include("levels/test.oxw") ?-->
-
-<!--audio>
-	<ambient>
-		<ogg src="allgorythm-lift_up" />
-		<ogg src="allgorythm-resonance_blaster" />
-		<ogg src="luke_grey_-_hypermode" />
-		<ogg src="task_horizon_-_menu1" />
-		<ogg src="tha_silent_partner_-_void" />
-	</ambient>
-  </audio--> 
-
-<Ambient colourvalue="0.8, 0.8, 0.8" />
-<Skybox src="Orxonox/Starbox" />
-<SpaceShip camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
-<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
-<Model position="100000,0,0" scale="1000" mesh="planet.mesh"/>
-<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
-<NPC position="0,100,400" scale="1" mesh="razor.mesh"/>
-<NPC position="0,-100,500" scale="1" mesh="razor.mesh"/>
-<NPC position="0,-200,450" scale="1" mesh="razor.mesh"/>
-<NPC position="100,0,400" scale="1" mesh="razor.mesh"/>
-
-<!--
-<?lua
-for i = 1, 10, 1 
-do ?>
-  <SpaceShipAI position="<?lua print(math.random() * 6000 - 3000) ?>,<?lua print(math.random() * 6000 - 3000) ?>,<?lua print(math.random() * 6000 - 3000) ?>" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<?lua 
-end
-?>
--->
-
-<!--Model name="starship" position="200,0,500" scale="10" mesh="starship.mesh" yawpitchroll="-90,-90,0" />
-<Model name="drone" position="-200,0,500" scale="10" mesh="drone.mesh" yawpitchroll="-90,-90,0">
-  <attached>
-    <Model name="drone2" position="200,-100,-500" scale="10" mesh="drone.mesh" yawpitchroll="-90,-90,0">
-      <attached>
-        <Model name="starship2" position="500,200,-500" scale="10" mesh="starship.mesh" yawpitchroll="-90,-90,0" />
-      </attached>
-    </Model>
-  </attached>
-</Model-->
-
-<!--Model position="-200,1000,500" scale="10" mesh="hoover_body.mesh" yawpitchroll="-90,-90,0" />
-<Model position="-200,1000,500" scale="10" mesh="hoover_gear0.mesh" yawpitchroll="-90,-90,0" />
-<Model position="-200,1000,500" scale="10" mesh="hoover_gear1.mesh" yawpitchroll="-90,-90,0" />
-<Model position="-200,1000,500" scale="10" mesh="hoover_gear2.mesh" yawpitchroll="-90,-90,0" />
-<Model position="-200,1000,500" scale="10" mesh="hoover_turbine.mesh" yawpitchroll="-90,-90,0" /-->
-
-<!--Trigger position="0,200,0" scale="2" delay="2" stayOn="1">
-  <DistanceTrigger position="100,0,0" scale="2" distance="80" stayOn="1.0" target="SpaceShip"/>
-  <DistanceTrigger position="150,0,0" scale="2" distance="80" stayOn="1.0" target="SpaceShip"/>
-</Trigger-->
-
-<?lua
-for i = 1, 226, 1 
-do ?>
-  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua 
-end
-?>

Deleted: media/levels/sample2.oxw
===================================================================
--- media/levels/sample2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/sample2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,187 +0,0 @@
-<?lua
-  include("levels/hudtemplates.oxw")
-  include("levels/spaceshiptemplates.oxw")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.8, 0.8, 0.8"
-   skybox       = "Orxonox/Starbox"
-  >
-    <!--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-->
-	<!--PositionableEntity position="0,0,0">
-		<attached>
-			<Model position="0,0,0" scale=1 mesh="axes.mesh" />
-		</attached>
-	</PositionableEntity -->
-	
-	<!-- red sphere for phsics engine testing purposes-->
-	<!--PositionableEntity position="40,0,0">
-		<attached>
-			<Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-		</attached>
-	</PositionableEntity-->
-
-	<!-- yellow cube for phsics engine testing purposes-->
-	<!--PositionableEntity position="80,0,0">
-		<attached>
-			<Model position="0,0,0" scale=1 mesh="cube.mesh" />
-		</attached>
-	</PositionableEntity-->
-
-	<!-- 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="badsatellitedish.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" />
-        <PositionableEntity 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/fire3" />
-                  </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>
-        </PositionableEntity>
-        <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>
-
-    <ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-
-
-    <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>
-    </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=false>
-      <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 name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=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: media/levels/sample3.oxw
===================================================================
--- media/levels/sample3.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/sample3.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,191 +0,0 @@
-<?lua
-  include("levels/hudtemplates3.oxw")
-?>
-
-<?lua
-  include("levels/spaceshiptemplates3.oxw")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-    <!-- This is for Orxonox/Starbox -- Light type=directional position="0,0,0" direction="0.817, -0.400, 0.415" diffuse="1.0, 0.9, 0.6, 1.0" specular="1.0, 0.9, 0.6, 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 />
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,-200,0" distance=50 target="ControllableEntity" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-
-    <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>
-        <Billboard material="Examples/Flare" colour="0.5, 0.5, 1.0, 1.0" scale=4 />
-        <Model position="0,0,0" scale=10 mesh="ast1.mesh" />
-        <PositionableEntity 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">
-                  <attached>
-                    <Backlight position="0, 0, 0" colour="0.0, 1.0, 0.0, 1.0" width=1 length=100 lifetime=0.5 elements=50 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
-                  </attached>
-                </Model>
-                <Model position="0,-35,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <Backlight position="0, 0, 0" colour="1.0, 0.0, 1.0, 1.0" width=1 length=100 lifetime=0.5 elements=50 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
-                  </attached>
-                </Model>
-                <Model position="35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-                    <Backlight position="0, 0, 0" colour="0.0, 0.0, 1.0, 1.0" width=1 length=100 lifetime=0.5 elements=50 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
-                  </attached>
-                </Model>
-                <Model position="-35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-                    <Backlight position="0, 0, 0" colour="1.0, 0.0, 0.0, 1.0" width=1 length=100 lifetime=0.5 elements=50 trailmaterial="Trail/backlighttrail" material="Examples/Flare" />
-                  </attached>
-                </Model>
-              </attached>
-            </MovableEntity>
-          </attached>
-        </PositionableEntity>
-        <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>
-
-    <ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-
-<!--
-    <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>
-    </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=false>
-      <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 name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=fireleft />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="0,0,200" distance=50 target="ControllableEntity" />
-        </activity>
-      </events>
-    </EventDispatcher>
-
-<!--
-    <EventDispatcher>
-      <targets>
-        <EventTarget name=bltest />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger switch=1 position="0,200,0" 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" /-->
-
-
-<?lua
-for i = 1, 0, 1 
-do ?>
-  <MovableEntity position="<?lua print(math.random() * 4000 - 2000)?>, <?lua print(math.random() * 4000 - 2000) ?>, <?lua print(math.random() * 4000 - 2000) ?>" 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() * 15 + 5) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-    </attached>
-  </MovableEntity>
-<?lua 
-end
-?>
-
-  </Scene>
-</Level>

Deleted: media/levels/sample4.oxw
===================================================================
--- media/levels/sample4.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/sample4.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,160 +0,0 @@
-<?lua
-  include("levels/hudtemplates.oxw")
-?>
-
-<?lua
-  include("levels/spaceshiptemplates2.oxw")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-  >
-    <!--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 /-->
-
-    <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" />
-        <PositionableEntity 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/fire3" />
-                  </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>
-        </PositionableEntity>
-        <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>
-
-
-    <ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-
-
-    <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>
-    </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=false>
-      <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 name=fireright />
-        <EventTarget name=firecenter />
-        <EventTarget name=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: media/levels/spaceship_H2.oxw
===================================================================
--- media/levels/spaceship_H2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceship_H2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,137 +0,0 @@
-<Template name=spaceshipHtwo>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipHtwocameras
-   engine                 =spaceshipHtwoengine
-   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
-  >
-
-<?lua
-  include("levels/weaponsettings_H2.oxw")
-?>
-
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale3D="3,0.833,0.833" mesh="h2_green.mesh" />
-      <BlinkingBillboard position="11.68,4.02,9.52" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-12.27,4.02,9.52" 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>
-    
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHtwocameras 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 />
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHtwoengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-      <active>
-      <FadingBillboard mainstate=activity active=false scale=0.05 position="-0.1, 2, 12" colour="0, 0.65, 0, 0.5" material="Examples/FlareZwei_1" turnontime=0.5 turnofftime=0.5 />
-<!--
-      <Light mainstate=visibility position=" 12.7, 4, 17.2" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
-      <Light mainstate=visibility position="-13, 4, 16.8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
--->
-    </active>
-    <forward>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 12.45" 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.26, 1.66, 12.45" 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" />
-    </forward>
-    <boost>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06,1.66, 12.45" 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.26, 1.66, 12.45" 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" />
-    </boost>
-    <brake>
-<!--
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 12.7, 4.2, 11.5" 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="-13, 4.2, 11.5" 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=" 12.7, 4.2, 11.5" 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="-13, 4.2, 11.5" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
--->
-    </brake>
-  </MultiStateEngine>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Deleted: media/levels/spaceshiptemplates.oxw
===================================================================
--- media/levels/spaceshiptemplates.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,82 +0,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   camerapositiontemplate = spaceshipassffcameras
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 150
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 100
-   rotacc            = 140
-   transdamp         = 75
-   
-   collisionType     = "dynamic"
-   mass              = 100
-   name              = "blubbbeliblubb"
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
-      <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 />
-      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
-    </attached>
-    <collisionShapes>
-      <SphereCollisionShape radius=50/>
-    </collisionShapes>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10,40" />
-      <CameraPosition position="0,150,-25" pitch=-90 />
-      <CameraPosition position="0,0,-30" yaw=180 />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 />
-      <CameraPosition position="50,5,-8" yaw=90 />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Deleted: media/levels/spaceshiptemplates2.oxw
===================================================================
--- media/levels/spaceshiptemplates2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,94 +0,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   camerapositiontemplate = spaceshipassffcameras
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 150
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 100
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
-      <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 />
-      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
-    </attached>
-    <weaponslots>
-      <WeaponSlot position="-15,-1.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-1.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,2.5,5" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack firemode=0>
-        <LaserGun position="0,0,0" munitionType="LaserGunMunition" bulletLoadingTime="0.2" magazineLoadingTime="5.0" speed="1250" />
-        <LaserGun position="0,0,0" munitionType="LaserGunMunition" bulletLoadingTime="0.2" magazineLoadingTime="5.0" speed="1250" />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion position="0,0,0" munitionType="LaserGunMunition" bulletLoadingTime="4" magazineLoadingTime="4" speed="500" />
-      </WeaponPack>
-    </weapons>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10,40" />
-      <CameraPosition position="0,150,-25" pitch=-90 />
-      <CameraPosition position="0,0,-30" yaw=180 />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 />
-      <CameraPosition position="50,5,-8" yaw=90 />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Deleted: media/levels/spaceshiptemplates3.oxw
===================================================================
--- media/levels/spaceshiptemplates3.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates3.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,116 +0,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   engine                 = spaceshipassffengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxrotation       = 100
-   rotacc            = 140
-   transdamp         = 50
-  >
-    <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>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras 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 />
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 100
-   accelerationbrake     = 100
-   accelerationback      =  25
-   accelerationleftright =  25
-   accelerationupdown    =  25
-  >
-    <active>
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-<!--
-      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
-      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
--->
-    </active>
-    <forward>
-      <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" />
-    </forward>
-    <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" />
-    </boost>
-    <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 />
-    </brake>
-  </MultiStateEngine>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Deleted: media/levels/spaceshiptemplates_physics.oxw
===================================================================
--- media/levels/spaceshiptemplates_physics.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates_physics.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,87 +0,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   camerapositiontemplate = spaceshipassffcameras
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 10;
-   
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.999
-   name              = "blubbbeliblubb"
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
-      <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 />
-      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
-    </attached>
-    <collisionShapes>
-      <!--SphereCollisionShape position="0,0,0"      radius=20 /-->
-      <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>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10,40" />
-      <CameraPosition position="0,150,-25" pitch=-90 />
-      <CameraPosition position="0,0,-30" yaw=180 />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 />
-      <CameraPosition position="50,5,-8" yaw=90 />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Deleted: media/levels/spaceshiptemplates_pirate.oxw
===================================================================
--- media/levels/spaceshiptemplates_pirate.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates_pirate.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,88 +0,0 @@
-<Template name=spaceshippirate>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshippiratecameras
-   engine                 = spaceshippirateengine
-   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>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-      <BlinkingBillboard position=" 12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 />
-      <BlinkingBillboard position="-12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="90"/>
-      <BlinkingBillboard position=" 8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="30"/>
-      <BlinkingBillboard position="-8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="60"/>
-    </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("levels/weaponsettings_pirate.oxw")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshippiratecameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,8, 60" drag=true mouselook=true />
-      <CameraPosition position="0,16, 120" drag=true mouselook=true />
-      <CameraPosition position="0,24,180" drag=true mouselook=true />
-      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshippirateengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <active>
-      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 0, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.02 position="-1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-    </active>
-    <forward>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </forward>
-    <boost>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="  0,  5, 15.5" colour="1.0, 0.65, 0.2, 1.0" width=16 length=1600 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </boost>
-    <brake>
-      <FadingBillboard mainstate=activity active=false scale=0.1 position=" 4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="-4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </brake>
-  </MultiStateEngine>
-</Template>

Deleted: media/levels/spaceshiptemplates_presentation.oxw
===================================================================
--- media/levels/spaceshiptemplates_presentation.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/spaceshiptemplates_presentation.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,132 +0,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   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>
-      <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("levels/weaponsettings2.oxw")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras 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 />
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <active>
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-<!--
-      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
-      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
--->
-    </active>
-    <forward>
-      <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" />
-    </forward>
-    <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" />
-    </boost>
-    <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 />
-    </brake>
-  </MultiStateEngine>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->

Modified: media/levels/teambasematchlevel.oxw
===================================================================
--- media/levels/teambasematchlevel.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/teambasematchlevel.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <Level
@@ -19,7 +19,7 @@
     <TeamSpawnPoint team=1 position="-500,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
 
     <TeamBaseMatchBase
-     name              = "base 1" 
+     name              = "base 1"
      position          = "1200, 0, 0"
 
      health            = 100
@@ -28,7 +28,7 @@
 
      collisionType     = "dynamic"
      mass              = 10000
-     linearDamping     = 0.9	
+     linearDamping     = 0.9
      angularDamping    = 0.99999
     >
       <attached>
@@ -41,7 +41,7 @@
 
 
     <TeamBaseMatchBase
-     name              = "base 2" 
+     name              = "base 2"
      position          = "-1200, 0, 0"
 
      health            = 100
@@ -63,7 +63,7 @@
 
 
     <TeamBaseMatchBase
-     name              = "base 3" 
+     name              = "base 3"
      position          = "0, 0, 1200"
 
      health            = 100
@@ -84,7 +84,7 @@
     </TeamBaseMatchBase>
 
     <TeamBaseMatchBase
-     name              = "base 4" 
+     name              = "base 4"
      position          = "0, 0, -1200"
 
      health            = 100
@@ -106,7 +106,7 @@
 
 
     <TeamBaseMatchBase
-     name              = "base 5" 
+     name              = "base 5"
      position          = "0, 0, 0"
 
      health            = 100


Property changes on: media/levels/teambasematchlevel.oxw
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/templates/spaceship_H2.oxt
===================================================================
--- media/levels/templates/spaceship_H2.oxt	                        (rev 0)
+++ media/levels/templates/spaceship_H2.oxt	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,137 @@
+<Template name=spaceshipHtwo>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipHtwocameras
+   engine                 =spaceshipHtwoengine
+   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
+  >
+
+<?lua
+  include("levels/includes/weaponsettings_H2.oxi")
+?>
+
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale3D="3,0.833,0.833" mesh="h2_green.mesh" />
+      <BlinkingBillboard position="11.68,4.02,9.52" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-12.27,4.02,9.52" 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>
+
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHtwocameras 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 />
+      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
+      <CameraPosition position="0,0,-40" yaw=180 drag=true />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
+      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHtwoengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+      <active>
+      <FadingBillboard mainstate=activity active=false scale=0.05 position="-0.1, 2, 12" colour="0, 0.65, 0, 0.5" material="Examples/FlareZwei_1" turnontime=0.5 turnofftime=0.5 />
+<!--
+      <Light mainstate=visibility position=" 12.7, 4, 17.2" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+      <Light mainstate=visibility position="-13, 4, 16.8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+-->
+    </active>
+    <forward>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 12.45" 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.26, 1.66, 12.45" 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" />
+    </forward>
+    <boost>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06,1.66, 12.45" 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.26, 1.66, 12.45" 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" />
+    </boost>
+    <brake>
+<!--
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 12.7, 4.2, 11.5" 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="-13, 4.2, 11.5" 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=" 12.7, 4.2, 11.5" 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="-13, 4.2, 11.5" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+-->
+    </brake>
+  </MultiStateEngine>
+</Template>
+
+<!--Template name=spaceshippirate>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+    </attached>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+    </attached>
+  </SpaceShip>
+</Template-->


Property changes on: media/levels/templates/spaceship_H2.oxt
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/templates/spaceship_assff.oxt
===================================================================
--- media/levels/templates/spaceship_assff.oxt	                        (rev 0)
+++ media/levels/templates/spaceship_assff.oxt	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,132 @@
+<Template name=spaceshipassff>
+  <SpaceShip
+   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>
+      <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("levels/includes/weaponsettings1.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras 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 />
+      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
+      <CameraPosition position="0,0,-40" yaw=180 drag=true />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
+      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <active>
+      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+<!--
+      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+-->
+    </active>
+    <forward>
+      <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" />
+    </forward>
+    <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" />
+    </boost>
+    <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 />
+    </brake>
+  </MultiStateEngine>
+</Template>
+
+<!--Template name=spaceshippirate>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+    </attached>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+    </attached>
+  </SpaceShip>
+</Template-->


Property changes on: media/levels/templates/spaceship_assff.oxt
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/levels/templates/spaceship_pirate.oxt
===================================================================
--- media/levels/templates/spaceship_pirate.oxt	                        (rev 0)
+++ media/levels/templates/spaceship_pirate.oxt	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,88 @@
+<Template name=spaceshippirate>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshippiratecameras
+   engine                 = spaceshippirateengine
+   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>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+      <BlinkingBillboard position=" 12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 />
+      <BlinkingBillboard position="-12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="90"/>
+      <BlinkingBillboard position=" 8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="30"/>
+      <BlinkingBillboard position="-8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="60"/>
+    </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("levels/includes/weaponsettings_pirate.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshippiratecameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,8, 60" drag=true mouselook=true />
+      <CameraPosition position="0,16, 120" drag=true mouselook=true />
+      <CameraPosition position="0,24,180" drag=true mouselook=true />
+      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshippirateengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <active>
+      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 0, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position="-1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+    </active>
+    <forward>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </forward>
+    <boost>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="  0,  5, 15.5" colour="1.0, 0.65, 0.2, 1.0" width=16 length=1600 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </boost>
+    <brake>
+      <FadingBillboard mainstate=activity active=false scale=0.1 position=" 4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.1 position="-4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </brake>
+  </MultiStateEngine>
+</Template>


Property changes on: media/levels/templates/spaceship_pirate.oxt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: media/levels/tutorial.oxw
===================================================================
--- media/levels/tutorial.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/tutorial.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,7 +1,7 @@
 <?lua
-  include("levels/hudtemplates3.oxw")
+  include("overlay/hudtemplates3.oxo")
   include("overlay/stats.oxo")
-  include("levels/spaceshiptemplates_presentation.oxw")
+  include("levels/templates/spaceship_assff.oxt")
 ?>
 
 <Level
@@ -29,10 +29,10 @@
 <Model mesh="hs-w01s.mesh" scale=10 position="0,0,-100" />
 
 <?lua
-for i = 1, 10, 1 
+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 
+<?lua
 end
 ?>
 
@@ -51,7 +51,7 @@
     </StaticEntity>
 <!--
 <?lua
-for i = 1, 70, 1 
+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>
@@ -85,7 +85,7 @@
       <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
     </attached>
   </MovableEntity>
-<?lua 
+<?lua
 end
 ?>
 -->

Deleted: media/levels/tutorial_hs08.oxw
===================================================================
--- media/levels/tutorial_hs08.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/tutorial_hs08.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,26 +0,0 @@
-<Ambient colourvalue="0.8, 0.8, 0.8" />
-<Skybox src="Orxonox/Starbox" />
-
-<!-- This is your own space ship. The complicated XML values are not important -->
-<TutorialShip
-    camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0"
-
-SpecialEffects="true"
-
-/>
-
-<!-- A few models flying around -->
-<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
-<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
-
-<!-- Embedded lua code (creates random asteroids) -->
-<?lua
-for i = 1, 226, 1 
-do ?>
-  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua 
-end
-?>

Deleted: media/levels/weaponsettings1.oxw
===================================================================
--- media/levels/weaponsettings1.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/weaponsettings1.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,39 +0,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15,-1.5,-25" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack firemode=0>
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion
-            position="0,0,0"
-            munitionType="FusionMunition"
-            bulletLoadingTime="0.3"
-            magazineLoadingTime="3"
-            speed="600"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-    </weapons>

Deleted: media/levels/weaponsettings2.oxw
===================================================================
--- media/levels/weaponsettings2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/weaponsettings2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,46 +0,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15,-0.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="195"/>
-            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="165"/>
-            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
-          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </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,-20" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>

Deleted: media/levels/weaponsettings_H2.oxw
===================================================================
--- media/levels/weaponsettings_H2.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/weaponsettings_H2.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,46 +0,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 12.1, 3, 9" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="-12.2, 3, 9" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="120"/>
-            <Model mesh="hs-w01s.mesh" roll="120" position="0.1,0.5,0" scale="0.5"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="-120" scale3D="-1,1,1"/>
-            <Model mesh="hs-w01s.mesh" roll="-120" position="-0.1,0.5,0" scale="0.5"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
-          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </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,-20" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>

Deleted: media/levels/weaponsettings_pirate.oxw
===================================================================
--- media/levels/weaponsettings_pirate.oxw	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/levels/weaponsettings_pirate.oxw	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,28 +0,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="-4.4, -5.5, -30" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack firemode=0>
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-    </weapons>

Modified: media/overlay/OrxonoxLoading.overlay
===================================================================
--- media/overlay/OrxonoxLoading.overlay	2009-05-21 15:18:23 UTC (rev 2152)
+++ media/overlay/OrxonoxLoading.overlay	2009-05-23 01:44:34 UTC (rev 2153)
@@ -1,13 +1,13 @@
-Orxonox/LoadingScreenSample
-{
-   container Panel(Orxonox/LoadingScreenSample)
-   {
-      metrics_mode pixels
-      vert_align top
-      left 12
-      top 12
-      width 300
-      height 300
-      material Orxonox/LoadingScreenSample
-   }
+Orxonox/LoadingScreenSample
+{
+   container Panel(Orxonox/LoadingScreenSample)
+   {
+      metrics_mode pixels
+      vert_align top
+      left 12
+      top 12
+      width 300
+      height 300
+      material Orxonox/LoadingScreenSample
+   }
 } 
\ No newline at end of file


Property changes on: media/overlay/OrxonoxLoading.overlay
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/overlay/hudtemplates3.oxo
===================================================================
--- media/overlay/hudtemplates3.oxo	                        (rev 0)
+++ media/overlay/hudtemplates3.oxo	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,99 @@
+<!--
+<Template name="defaultHUD">
+  <OverlayGroup name = "defaultHUD" scale = "1, 1">
+    <ChatOverlay
+     name     = "chat"
+     position = "0.03, 0.5"
+     font     = "VeraMono"
+     caption  = ""
+     textsize = 0.025
+    />
+
+    <GametypeStatus
+     name     = "state"
+     position = "0.5, 0.85"
+     font     = "VeraMono"
+     textsize = 0.05
+     colour   = "1.0, 1.0, 0.0, 0.8"
+     align    = "center"
+    />
+  </OverlayGroup>
+</Template>
+-->
+
+<Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>
+
+<Template name="spaceshiphud">
+  <OverlayGroup name = "spaceshiphud" scale = "1, 1">
+    <Map />
+
+    <HUDHealthBar
+     name              = "HealthBar1"
+     background        = "Orxonox/HealthBarBackground"
+     size              = "0.35, 0.0875"
+     position          = "0.0 , 0.95 "
+     pickpoint         = "0, 1"
+     bartexture        = "healthbar_bar.tga"
+     textfont          = "VeraMono"
+     textusebarcolour  = true
+     textsize          = 0.039
+     textoffset        = "0.315, 0.05"
+     textpickpoint     = "0, 0"
+     textalign         = "right"
+     correctaspect     = false
+     textcorrectaspect = false
+    >
+      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+    </HUDHealthBar>
+
+    <HUDSpeedBar
+     name          = "SpeedBar1"
+     background    = "Orxonox/BarBackground"
+     size          = "0.35, 0.05"
+     position      = "0.0 , 1.0 "
+     pickpoint     = "0, 1"
+     correctaspect = false
+    >
+      <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
+      <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
+      <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
+    </HUDSpeedBar>
+
+    <HUDNavigation
+     name          = "Navigation"
+     correctaspect = true
+     font          = "Monofur"
+     textsize      = 0.05
+     navMarkerSize = 0.03
+     aimMarkerSize = 0.04
+    />
+
+    <HUDRadar
+     name          = "Radar"
+     background    = "Orxonox/Radar"
+     correctaspect = true
+     size          = "0.17, 0.17"
+     position      = "1.0, 1.0"
+     pickpoint     = "1.0, 1.0"
+     rotation      = 0
+     sensitivity   = 1.0
+     halfDotSizeDistance = 3000
+     maximumDotSize      = 0.1
+    />
+
+    <HUDTimer
+     name     = "Timer"
+     position = "0.5, 0.85"
+     font     = "VeraMono"
+     textsize = 0.1
+     colour   = "1.0, 1.0, 0.0, 0.8"
+     align    = "center"
+    />
+
+  </OverlayGroup>
+</Template>


Property changes on: media/overlay/hudtemplates3.oxo
___________________________________________________________________
Added: svn:eol-style
   + native

Added: media/overlay/ponghud.oxo
===================================================================
--- media/overlay/ponghud.oxo	                        (rev 0)
+++ media/overlay/ponghud.oxo	2009-05-23 01:44:34 UTC (rev 2153)
@@ -0,0 +1,70 @@
+<Template name="PongHUD">
+  <OverlayGroup name="PongHUD" scale = "1, 1">
+    <PongScore
+     position  = "0.05, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showleftplayer  = true
+     showrightplayer = false
+     showname        = true
+     showscore       = false
+    />
+
+    <PongScore
+     position  = "0.49, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+
+     showleftplayer  = true
+     showrightplayer = false
+     showname        = false
+     showscore       = true
+    />
+
+    <OverlayText
+     position  = "0.505, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "center"
+
+     caption   = ":"
+    />
+
+    <PongScore
+     position  = "0.51, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+
+     showleftplayer  = false
+     showrightplayer = true
+     showname        = false
+     showscore       = true
+    />
+
+    <PongScore
+     position  = "0.95, 0.05"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.06
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "right"
+
+     showleftplayer  = false
+     showrightplayer = true
+     showname        = true
+     showscore       = false
+    />
+  </OverlayGroup>
+</Template>


Property changes on: media/overlay/ponghud.oxo
___________________________________________________________________
Added: svn:eol-style
   + native




More information about the Orxonox-commit mailing list