Changeset 8487 for code/branches/dockingsystem2/data

Timestamp:

May 16, 2011, 1:39:51 PM (14 years ago)

Author:

sven

Message:

 

Location:

code/branches/dockingsystem2/data

Files:

• gui/scripts/DockingDialog.lua (modified) (1 diff)
• levels/docking.oxw (modified) (2 diffs)

code/branches/dockingsystem2/data/gui/scripts/DockingDialog.lua

@@ -10 +10 @@
 
 function P.onShow()
+    orxonox.CommandExecutor:execute("pause")
     P.update()
-    orxonox.CommandExecutor:execute("pause")
 end
 

code/branches/dockingsystem2/data/levels/docking.oxw

@@ -37 +37 @@
 
     <Dock>
+        <animation>
+            <MoveToDockingTarget target="destroyer" position="10,150,40" />
+        </animation>
         <effects>
             <DockToShip target="destroyer" />
@@ -46 +49 @@
         </events>
         <attached>
-            <DistanceTrigger position="0,0,0" distance="50" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
+            <DistanceTrigger position="0,0,0" distance="30" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
             <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
         </attached>