Changeset 12372 for code

Timestamp:

May 16, 2019, 1:16:55 PM (6 years ago)

Author:

ahuwyler

Message:

Merge

File:

• code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw (modified) (5 diffs)

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -7 +7 @@
 
 <?lua
-  
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
   include("OrxoBloxHUD.oxo")
@@ -42 +42 @@
       <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 />
@@ -59 +56 @@
         <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>
@@ -69 +63 @@
   <Template name=OrxoBloxwall>
     <OrxoBloxWall>
-            <collisionShapes>
-                <BoxCollisionShape halfExtents="4.5, 4.5, 4.5" />
-      </collisionShapes>
     </OrxoBloxWall>
   </Template>
@@ -93 +84 @@
     <!-- <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" /> -->