[Orxonox-commit 7148] r11765 - code/branches/Presentation_HS17_merge/data/levels

[landauf at orxonox.net]

Author: landauf
Date: 2018-02-18 01:32:05 +0100 (Sun, 18 Feb 2018)
New Revision: 11765

Modified:
   code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw
   code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw
Log:
[ProtectBoss_HS17] fixed level and reverted unwanted changes from emptyLevel.oxw

Modified: code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw	2018-02-18 00:17:48 UTC (rev 11764)
+++ code/branches/Presentation_HS17_merge/data/levels/ProtectBoss.oxw	2018-02-18 00:32:05 UTC (rev 11765)
@@ -11,7 +11,6 @@
   include("HUDTemplates3.oxo")
   include("templates/lodInformation.oxt")
   include("templates/HeavyCruiser.oxt")
-  include("HUDPickupTemplate.oxo")
   include("templates/pickupRepresentationTemplates.oxt")
 ?>
 

Modified: code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw	2018-02-18 00:17:48 UTC (rev 11764)
+++ code/branches/Presentation_HS17_merge/data/levels/emptyLevel.oxw	2018-02-18 00:32:05 UTC (rev 11765)
@@ -28,25 +28,6 @@
 
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-
-    <Model position="0,0,0" mesh="ast1.mesh" scale="20"/>
-    <Model position="100,0,0" mesh="ast2.mesh" scale="20"/>
-    <Model position="200,0,0" mesh="ast3.mesh" scale="20"/>
-    <Model position="300,0,0" mesh="ast4.mesh" scale="20"/>
-    <Model position="400,0,0" mesh="ast5.mesh" scale="20"/>
-    <Model position="500,0,0" mesh="ast6.mesh" scale="20"/>
-    <Model position="600,0,0" mesh="asteroid_ice.mesh" scale="20"/>
-    <Model position="700,0,0" mesh="asteroid_UV.mesh" scale="20"/>
-    <Model position="900,0,0" mesh="drone.mesh" scale="20"/>
-    <Model position="1000,0,0" mesh="Fahne.mesh" scale="20"/>
-    <Model position="1100,0,0" mesh="GravityBomb.mesh" scale="20"/>
-    <Model position="1200,0,0" mesh="GravityBombRocket.mesh" scale="20"/>
-    <Model position="1300,0,0" mesh="hovership_body.mesh" scale="20"/>
-    <Model position="1400,0,0" mesh="hovership_engine.mesh" scale="20"/>
-    <Model position="1500,0,0" mesh="satellite.mesh" scale="20"/>
-    <Model position="1800,0,0" mesh="Spacebomb.mesh" scale="20"/>
-    <Model position="2100,0,0" mesh="Transporter.mesh" scale="20"/>
-    <Model position="2400,0,0" mesh="Transporterspaceship.mesh" scale="20"/>
     
   </Scene>
 </Level>