[Orxonox-commit 7780] r12372 - code/branches/OrxoBlox_FS19/data/levels

[ahuwyler at orxonox.net]

Author: ahuwyler
Date: 2019-05-16 13:16:55 +0200 (Thu, 16 May 2019)
New Revision: 12372

Modified:
   code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
Log:
Merge

Modified: code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw
===================================================================
--- code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-16 11:13:58 UTC (rev 12371)
+++ code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw	2019-05-16 11:16:55 UTC (rev 12372)
@@ -6,7 +6,7 @@
 />
 
 <?lua
-  
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
   include("OrxoBloxHUD.oxo")
   include("templates/lodInformation.oxt")
@@ -41,9 +41,6 @@
       <Light type=point diffuse="1.0, 1.0, 0.5" specular="1.0, 1.0, 0.5" attenuation="1200, 1.0, 0.0035, 0.00005" />
       <ParticleSpawner name=hiteffect position="0,0,0" source="Orxonox/sparks2" lifetime=0.01 autostart=0 mainstate=spawn />
     </attached>
-      <collisionShapes>
-          <SphereCollisionShape radius="2" />
-      </collisionShapes>
     <eventlisteners>
       <EventTarget target=hiteffect />
     </eventlisteners>
@@ -58,9 +55,6 @@
         <Model position="0,0,0" mesh="CuboidBody.mesh" scale=4.5 />
         <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
       </attached>
-      <collisionShapes>
-                <BoxCollisionShape halfExtents="4.5, 4.5, 4.5" />
-      </collisionShapes>
     </OrxoBloxStones>
   </Template>
   
@@ -68,9 +62,6 @@
   
   <Template name=OrxoBloxwall>
     <OrxoBloxWall>
-            <collisionShapes>
-                <BoxCollisionShape halfExtents="4.5, 4.5, 4.5" />
-      </collisionShapes>
     </OrxoBloxWall>
   </Template>
 
@@ -92,7 +83,7 @@
   >
     <!-- <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"/> -->
     <Light type=directional position="-100, 10000, -700" direction="0.2, -1, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-    <SpawnPoint team=0 position="0,-4.5,49" lookat="-49,-4.5,0" spawnclass= OrxoBloxShip pawndesign=spaceshipOrxoBlox/>
+    <SpawnPoint team=0 position="0,150,0" lookat="0,0,0" spawnclass= OrxoBloxShip pawndesign=spaceshipOrxoBlox/>
 
     <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->