[Orxonox-commit 5292] r9955 - in code/trunk/data/levels: . templates
landauf at orxonox.net
landauf at orxonox.net
Fri Jan 3 15:58:54 CET 2014
Author: landauf
Date: 2014-01-03 15:58:53 +0100 (Fri, 03 Jan 2014)
New Revision: 9955
Removed:
code/trunk/data/levels/_temp.oxw
code/trunk/data/levels/templates/.shipmodels
Modified:
code/trunk/data/levels/
code/trunk/data/levels/templates/
Log:
removed temporary files and added them to the ignore list
Property changes on: code/trunk/data/levels
___________________________________________________________________
Added: svn:ignore
+ _temp.oxw
Deleted: code/trunk/data/levels/_temp.oxw
===================================================================
--- code/trunk/data/levels/_temp.oxw 2014-01-03 14:54:05 UTC (rev 9954)
+++ code/trunk/data/levels/_temp.oxw 2014-01-03 14:58:53 UTC (rev 9955)
@@ -1,377 +0,0 @@
-<LevelInfo
- name = "Surface Race Presentation"
- description = "just awesome 2.0"
- screenshot = "surfaceRace.png"
- tags = "gametype, shipselection"
- startingships = "spaceshipassff, spaceshipghost, spaceshipspacecruiser, spaceshiprace"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
- include("templates/spaceshipRace.oxt")
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipGhost.oxt")
- include("templates/spaceshipSpacecruiser.oxt")
- include("templates/pickupRepresentationTemplates.oxt")
-
-?>
-
-<Level
-gametype = SpaceRace
->
-
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <Scene
- ambientlight = "2.0, 2.0, 2.0"
- skybox = "Orxonox/skyBoxClouds"
- gravity = "0,-75,0"
- negativeWorldRange = "-100000, -100000, -100000"
- positiveWorldRange = " 100000, 100000, 100000"
- hasPhysics = true
- >
-
- <Template name=PortalDefault>
- <PortalEndPoint>
- <attached>
- <Model mesh="Spacegate.mesh" scale="3"/>
- </attached>
- </PortalEndPoint>
- </Template>
-
- <PortalEndPoint position="6000,8050,2500" id="1" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
- <PortalEndPoint position="6100,8050,-4500" id="2" distance="40" target="MobileEntity" design="PortalDefault" reenterDelay="0"/>
- <PortalLink fromID="1" toID="2" />
- <PortalLink fromID="2" toID="1" />
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-
-
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile01.mesh" shadow=true />
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile02.mesh" shadow=true />
- <Model position="4200,8050,-1000" scale=10 mesh="debris-pile03.mesh" shadow=true />
-
- <MovableEntity position="-700,8090,-300" velocity="80,0,0" rotationaxis="1,0,1" rotationrate=200>
- <attached>
- <Model position="0,0,-20" scale=10 mesh="cokebottle.mesh" />
- </attached>
- </MovableEntity>
-
-
-<SpaceRaceManager>
- <checkpoints>
- <RaceCheckPoint name="checkpoint1" position="0,8050,-1000" direction="0,1,0" collisionType="static" scale="4" distance="150" checkpointindex="0" islast="false" nextcheckpoints="1,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint2" position="1000,8050,-4000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="1" islast="false" nextcheckpoints="2,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint3" position="3000,8050,-4000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="2" islast="false" nextcheckpoints="3,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint4" position="4000,8050,-1000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="3" islast="false" nextcheckpoints="4,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint5" position="4000,8050,0" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="4" islast="false" nextcheckpoints="5,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint6" position="3000,8050,1000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="5" islast="false" nextcheckpoints="6,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint7" position="0,8050,2000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="6" islast="false" nextcheckpoints="7,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint8" position="-4000,8050,3000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="7" islast="false" nextcheckpoints="8,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint9" position="-4000,8050,5000" direction="0,1,0" roll="-45" collisionType="static" scale="4" distance="150" checkpointindex="8" islast="false" nextcheckpoints="9,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint10" position="-3000,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="150" checkpointindex="9" islast="false" nextcheckpoints="10,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint11" position="0,8050,6000" direction="0,1,0" roll="90" collisionType="static" scale="4" distance="120" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint12" position="6000,8050,6000" direction="0,1,0" roll="45" collisionType="static" scale="4" distance="150" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint13" position="5500,8050,3000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="12" islast="false" nextcheckpoints="13,-1,-1">
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-
- <RaceCheckPoint name="checkpoint14" position="6000,8050,-5000" direction="0,1,0" roll="0" collisionType="static" scale="4" distance="150" checkpointindex="13" islast="true" >
- <attached>
- <Model mass="50" scale="50" mesh="raceCheckPoint.mesh" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,0,220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="0,0,-220" halfExtents="220, 40, 40" />
- <BoxCollisionShape position="220,0,0" halfExtents="40, 40, 220" />
- <BoxCollisionShape position="-220,0,0" halfExtents="40, 40, 220" />
- </collisionShapes>
- </RaceCheckPoint>
-</checkpoints>
-</SpaceRaceManager>
-
- <SpawnPoint team=0 position="0,8050,0" lookat="0,8000,-8000" spawnclass=SpaceShip pawndesign=spaceshipspacecruiser />
-
-
- <!-- -----------------------Zylinder---------------------------- -->
-<StaticEntity position="2750,8050,6000" direction="1,0,0" roll="90" scale="4" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="cylinder.mesh" scale3D="100,100,400" />
- <!--
- <Model position="0,80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="0,-80,600" mesh="testcube.mesh" scale3D="90,18,-600" />
- <Model position="80,0,600" mesh="testcube.mesh" scale3D="18,90,-600" />
- <Model position="-80,0,600" mesh="testcube.mesh" scale3D="18,09,-600" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="0,-320,2400" halfExtents="360,72,2400" />
- <BoxCollisionShape position="320,0,2400" halfExtents="72,360,2400" />
- <BoxCollisionShape position="-320,0,2400" halfExtents="72,360,2400" />
-
-
-
- </collisionShapes>
-
- </StaticEntity>
-
-<!-- ------------------Cube between gate 4 and 5----------------- -->
-<StaticEntity position="4465,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-<StaticEntity position="3535,8050,-500" direction="0,0,0" scale="1" collisionType=static mass=100000 friction=0.01 >
- <attached>
- <Model position="0,0,0" mesh="blackcube.mesh" scale3D="450,600,50" />
-<!--
- <Model position="0,0,0" mesh="testcube.mesh" scale3D="450,600,50" />
- -->
-
- </attached>
-
-
- <collisionShapes>
-
-
- <BoxCollisionShape position="0,0,0" halfExtents="450,600,50" />
-
- </collisionShapes>
-
- </StaticEntity>
-
-
-
-
- <!-- ------------------Boden----------------- -->
- <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000 friction=0.01>
- <attached>
- <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="8000,8000,8000" />
- </attached>
- <collisionShapes>
- <BoxCollisionShape position="0,50,0" halfExtents="8000,8000,8000" />um j?:P"{
-
- </collisionShapes>
-</StaticEntity>
-
-
-<!-- ---------------------PickUp---------------------- -->
-
-
- <PickupSpawner pickup=smallspeedpickup position="4000,8050,0" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup=mediumspeedpickup position="5500,8100,2000" triggerDistance="40" respawnTime="10" maxSpawnedItems="99" scale="8" />
- <PickupSpawner pickup="mediumshrinkpickup" position="3000,8050,-4000" triggerDistance="40" respawnTime="60" maxSpawnedItems="5" scale="8" />
-
-
-
-
- <!-- ---------------asteroid ellipse----------------- -->
-
- <?lua
- max = 15
- for i = 0, max, 1
- do
- x=-12000
- y=10000
- z=-12000
-
- ?>
- <?lua
- for k = 1, 15, 1
- do
- j = math.random()
- ?>
-
- <MovableEntity
- position = "<?lua print(x + math.random() * 20000) ?>,<?lua print(y + math.random() * 5000) ?>,<?lua print(z + math.random() * 20000) ?>"
- collisionType = "dynamic"
- linearDamping = "0.5"
- angularDamping = "0.5"
- collisiondamage = "100"
- enablecollisiondamage = "true"
- scale="<?lua print(j * 5) ?>" >
- <attached>
- <Model position="0,0,0" scale="<?lua print(j * 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
- <?lua if k == 0 then ?><attached><!-- ---------asteroid fog----- -->
- <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
- </attached> <?lua end ?>
- </Model>
- </attached>
- <collisionShapes>
- <SphereCollisionShape radius="<?lua print(j * 80) ?>" />
- </collisionShapes>
- </MovableEntity>
- <?lua
- end
- ?>
- <?lua end ?>
-
- </Scene>
-</Level>
-
-
Property changes on: code/trunk/data/levels/templates
___________________________________________________________________
Added: svn:ignore
+ .shipmodels
Deleted: code/trunk/data/levels/templates/.shipmodels
===================================================================
--- code/trunk/data/levels/templates/.shipmodels 2014-01-03 14:54:05 UTC (rev 9954)
+++ code/trunk/data/levels/templates/.shipmodels 2014-01-03 14:58:53 UTC (rev 9955)
@@ -1,16 +0,0 @@
-spaceshipTransporterSL
-spaceshipTurret
-spaceshipGhost
-spaceshipEscort
-spaceshipSwallow
-spaceshipAssff
-spaceshipSpacecruiser
-spaceshipHXY
-spaceshipH2
-spaceshipHXYSL
-spaceshipCollateralDamage
-spaceshipAssff2
-spaceshipPirate
-spaceshipRace
-spaceshipTransporter
-spaceshipInvader
More information about the Orxonox-commit
mailing list