Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 12372


Ignore:
Timestamp:
May 16, 2019, 1:16:55 PM (4 months ago)
Author:
ahuwyler
Message:

Merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

    r12371 r12372  
    77
    88<?lua
    9  
     9  include("HUDTemplates3.oxo")
    1010  include("stats.oxo")
    1111  include("OrxoBloxHUD.oxo")
     
    4242      <ParticleSpawner name=hiteffect position="0,0,0" source="Orxonox/sparks2" lifetime=0.01 autostart=0 mainstate=spawn />
    4343    </attached>
    44       <collisionShapes>
    45           <SphereCollisionShape radius="2" />
    46       </collisionShapes>
    4744    <eventlisteners>
    4845      <EventTarget target=hiteffect />
     
    5956        <Model position="0,0,0" mesh="cube_orange.mesh" scale=4.3 />
    6057      </attached>
    61       <collisionShapes>
    62                 <BoxCollisionShape halfExtents="4.5, 4.5, 4.5" />
    63       </collisionShapes>
    6458    </OrxoBloxStones>
    6559  </Template>
     
    6963  <Template name=OrxoBloxwall>
    7064    <OrxoBloxWall>
    71             <collisionShapes>
    72                 <BoxCollisionShape halfExtents="4.5, 4.5, 4.5" />
    73       </collisionShapes>
    7465    </OrxoBloxWall>
    7566  </Template>
     
    9384    <!-- <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"/> -->
    9485    <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" />
    95     <SpawnPoint team=0 position="0,-4.5,49" lookat="-49,-4.5,0" spawnclass= OrxoBloxShip pawndesign=spaceshipOrxoBlox/>
     86    <SpawnPoint team=0 position="0,150,0" lookat="0,0,0" spawnclass= OrxoBloxShip pawndesign=spaceshipOrxoBlox/>
    9687
    9788    <!--<Model mesh="axes.mesh" scale=10 position="0,0,0" /> -->
Note: See TracChangeset for help on using the changeset viewer.