[Orxonox-commit 4856] r9525 - code/branches/presentationHS12/data/levels
jo at orxonox.net
jo at orxonox.net
Sat Jan 19 11:01:13 CET 2013
Author: jo
Date: 2013-01-19 11:01:13 +0100 (Sat, 19 Jan 2013)
New Revision: 9525
Modified:
code/branches/presentationHS12/data/levels/presentationHS12.oxw
code/branches/presentationHS12/data/levels/turretTest.oxw
Log:
The Turret class was not called in the turret test level. That is why the code was not executed.
Modified: code/branches/presentationHS12/data/levels/presentationHS12.oxw
===================================================================
--- code/branches/presentationHS12/data/levels/presentationHS12.oxw 2012-12-16 20:17:59 UTC (rev 9524)
+++ code/branches/presentationHS12/data/levels/presentationHS12.oxw 2013-01-19 10:01:13 UTC (rev 9525)
@@ -78,32 +78,26 @@
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint3" position="1200,-400,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="2" islast="false" nextcheckpoints="5,-1,-1">
+ <RaceCheckPoint name="checkpoint3" position="1200,-400,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="2" islast="false" nextcheckpoints="4,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint4" position="1200,100,700" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="3" islast="false" nextcheckpoints="6,-1,-1">
+ <RaceCheckPoint name="checkpoint4" position="1200,100,700" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="3" islast="false" nextcheckpoints="5,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
<!--- second three alternative paths --->
- <!--RaceCheckPoint name="checkpoint5" position="2000,500,-400" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="4" islast="false" nextcheckpoints="7,-1,-1">
+ <RaceCheckPoint name="checkpoint5" position="2000,0,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="4" islast="false" nextcheckpoints="7,8,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
- </RaceCheckPoint-->
-
- <RaceCheckPoint name="checkpoint6" position="2000,0,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="5" islast="false" nextcheckpoints="8,9,-1">
- <attached>
- <Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
- </attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint7" position="2000,-500,400" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="6" islast="false" nextcheckpoints="10,-1,-1">
+ <RaceCheckPoint name="checkpoint6" position="2000,-500,400" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="5" islast="false" nextcheckpoints="9,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
@@ -112,72 +106,72 @@
<!--- third generation --->
- <RaceCheckPoint name="checkpoint8" position="5000,0,-3000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="7" islast="false" nextcheckpoints="12,-1,-1">
+ <RaceCheckPoint name="checkpoint7" position="5000,0,-3000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="6" islast="false" nextcheckpoints="11,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=135 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint9" position="3500,800,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="8" islast="false" nextcheckpoints="11,-1,-1">
+ <RaceCheckPoint name="checkpoint8" position="3500,800,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="7" islast="false" nextcheckpoints="10,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint10" position="3500,-800,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="9" islast="false" nextcheckpoints="11,-1,-1">
+ <RaceCheckPoint name="checkpoint9" position="3500,-800,0" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="8" islast="false" nextcheckpoints="10,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint11" position="3500,0,1000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="10" islast="false" nextcheckpoints="12,-1,-1">
+ <RaceCheckPoint name="checkpoint10" position="3500,0,1000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="9" islast="false" nextcheckpoints="11,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
<!-- Intermediate Solo Gate -->
- <RaceCheckPoint name="checkpoint12" position="4500,0,-100" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="11" islast="false" nextcheckpoints="12,-1,-1">
+ <RaceCheckPoint name="checkpoint11" position="4500,0,-100" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="10" islast="false" nextcheckpoints="11,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=90 />
</attached>
</RaceCheckPoint>
<!---- First Common Point ---->
- <RaceCheckPoint name="checkpoint13" position="6000,0,2000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="12" islast="false" nextcheckpoints="13,14,-1">
+ <RaceCheckPoint name="checkpoint12" position="6000,0,2000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="11" islast="false" nextcheckpoints="12,14,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=45 />
</attached>
</RaceCheckPoint>
<!-- Two Paths (1) -->
- <RaceCheckPoint name="checkpoint14" position="7500,-1500,2500" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="13" islast="false" nextcheckpoints="15,-1,-1">
+ <RaceCheckPoint name="checkpoint13" position="7500,-1500,2500" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="12" islast="false" nextcheckpoints="14,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=130 roll=1 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint15" position="7500,-1500,1500" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="14" islast="false" nextcheckpoints="16,-1,-1">
+ <RaceCheckPoint name="checkpoint14" position="7500,-1500,1500" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="13" islast="false" nextcheckpoints="15,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=90 />
</attached>
</RaceCheckPoint>
<!-- Two Paths (2) -->
- <RaceCheckPoint name="checkpoint16" position="9000,-3000, 3000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="15" islast="false" nextcheckpoints="17,-1,-1">
+ <RaceCheckPoint name="checkpoint15" position="9000,-3000, 3000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="14" islast="false" nextcheckpoints="16,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=130 roll=1 />
</attached>
</RaceCheckPoint>
- <RaceCheckPoint name="checkpoint17" position="9000,-3000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="16" islast="false" nextcheckpoints="17,-1,-1">
+ <RaceCheckPoint name="checkpoint16" position="9000,-3000,1000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="15" islast="false" nextcheckpoints="16,-1,-1">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=110 />
</attached>
</RaceCheckPoint>
<!-- GOAL -->
- <RaceCheckPoint name="checkpoint18" position="12000,-4000,2000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="17" islast="true">
+ <RaceCheckPoint name="checkpoint17" position="12000,-4000,2000" direction="0,-1,1" collisionType="static" scale="1" distance="100" checkpointindex="16" islast="true">
<attached>
<Model mass="50" scale="6" mesh="BigSpacegate.mesh" yaw=100 pitch=135 />
</attached>
Modified: code/branches/presentationHS12/data/levels/turretTest.oxw
===================================================================
--- code/branches/presentationHS12/data/levels/turretTest.oxw 2012-12-16 20:17:59 UTC (rev 9524)
+++ code/branches/presentationHS12/data/levels/turretTest.oxw 2013-01-19 10:01:13 UTC (rev 9525)
@@ -43,7 +43,7 @@
-<SpaceShip position="0,10,0" pitch="90" yaw="0" roll="0">
+<Turret position="0,10,0" pitch="90" yaw="0" roll="0">
<templates>
<Template link=spaceshipturret />
</templates>
@@ -51,7 +51,10 @@
<WaypointPatrolController alertnessradius=100 team=10>
</WaypointPatrolController>
</controller>
-</SpaceShip>
+</Turret>
+
+
+
</Scene>
</Level>
More information about the Orxonox-commit
mailing list