[Orxonox-commit 4603] r9274 - in code/branches/presentation2012merge/data/levels: . templates

[landauf at orxonox.net]

Author: landauf
Date: 2012-06-03 21:51:59 +0200 (Sun, 03 Jun 2012)
New Revision: 9274

Modified:
   code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt
   code/branches/presentation2012merge/data/levels/theTimeMachine.oxw
Log:
reverted more random stuff in level files

Modified: code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt	2012-06-03 19:25:48 UTC (rev 9273)
+++ code/branches/presentation2012merge/data/levels/templates/spaceshipPirate.oxt	2012-06-03 19:51:59 UTC (rev 9274)
@@ -34,12 +34,11 @@
    linearDamping     = 0.7
    angularDamping    = 0.9999999
   >
-
     <engines>
       <MultiStateEngine position=" 0, 0, 0" template=spaceshippirateengine />
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=20 mesh="pirate.mesh" />
+      <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"/>

Modified: code/branches/presentation2012merge/data/levels/theTimeMachine.oxw
===================================================================
--- code/branches/presentation2012merge/data/levels/theTimeMachine.oxw	2012-06-03 19:25:48 UTC (rev 9273)
+++ code/branches/presentation2012merge/data/levels/theTimeMachine.oxw	2012-06-03 19:51:59 UTC (rev 9274)
@@ -58,28 +58,6 @@
   </SpaceShip>
 </Template>
 
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-
-  </MultiStateEngine>
-</Template>
-
 <!--*****************************************************************************************************************************************************************************************-->
 
 <Level