Changeset 10180

Timestamp:

Dec 15, 2014, 3:07:39 PM (9 years ago)

Author:

maxima

Message:

weaponupdateHS14 merged.

Location:

code/branches/presentationHS14

Files:

• . (modified) (1 prop)
• data/levels/FPS_Level_HS14.oxw (copied) (copied from code/branches/weaponupdateHS14/data/levels/FPS_Level_HS14.oxw)
• data/levels/includes/weaponSettingsFPS_HS14.oxi (copied) (copied from code/branches/weaponupdateHS14/data/levels/includes/weaponSettingsFPS_HS14.oxi)
• data/levels/presentationHS13.oxw (modified) (1 diff)
• data/levels/templates/FPS.oxt (modified) (1 diff)
• data/levels/templates/FPS_HS14.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/FPS_HS14.oxt)
• data/levels/templates/spacestation_elements.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/spacestation_elements.oxt)
• data/levels/templates/ss_tube01.oxt (copied) (copied from code/branches/weaponupdateHS14/data/levels/templates/ss_tube01.oxt)

code/branches/presentationHS14/data/levels/presentationHS13.oxw

@@ -131 +131 @@
 
             <undocking>
-                <EventListener event="undockMe" />
+                        <EventListener event="undockMe" />
             </undocking>
         

code/branches/presentationHS14/data/levels/templates/FPS.oxt

@@ -21 +21 @@
    weapon            = "hs-w01.mesh"
   >
-    <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
+    <collisionShapes>                   <!-- old values: position="0,-20,0"  halfExtents="15,25,15"  -->
+      <BoxCollisionShape position="0,-25,0" halfExtents="15,20,15" />
     </collisionShapes>