Changeset 8457 for code/trunk/data

Timestamp:

May 12, 2011, 1:51:18 PM (14 years ago)

Author:

FelixSchulthess

Message:

merged portals branch into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/levels/portals.oxw (copied) (copied from code/branches/portals/data/levels/portals.oxw) (1 diff)

code/trunk/data/levels/portals.oxw

@@ -36 +36 @@
 
     <PortalEndPoint position="0,0,0" id="1" distance="40" target="MobileEntity" design="PortalDefault"/>
-    <PortalEndPoint position="-90,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
+    <PortalEndPoint position="-100,0,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
     <PortalLink fromID="1" toID="2" />
     <PortalLink fromID="2" toID="1" />
 
-    <PickupSpawner position="-100,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10">
+    <!--PickupSpawner position="-200,0,0" triggerDistance="10" respawnTime="10" maxSpawnedItems="10">
       <pickup>
         <DronePickup template=dronepickup />
       </pickup>
-    </PickupSpawner>
+    </PickupSpawner-->
 
     <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" />