Changeset 11034 for code/branches/presentationHS15/data/levels/templates

Timestamp:

Jan 4, 2016, 10:13:21 AM (9 years ago)

Author:

fvultier

Message:

Merge latest changes from fabienHS15 to presentationHS15.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• data/levels/templates/pickupRepresentationTemplates.oxt (modified) (2 diffs)

code/branches/presentationHS15/data/levels/templates/pickupRepresentationTemplates.oxt

@@ -326 +326 @@
         <MunitionContainer munitiontype="SplitMunition" munitionamount=8 magazinesamount=0 />
         <MunitionContainer munitiontype="RocketMunition" munitionamount=0 magazinesamount=2 />
+        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=2 />
     </munitioncontainers>
-  </MunitionPickup></Template>
+  </MunitionPickup>
+</Template>
 
 <Template name=hugemunitionpickupRepresentation>
@@ -359 +361 @@
         <MunitionContainer munitiontype="IceMunition" munitionamount=0 magazinesamount=10 />
         <MunitionContainer munitiontype="GravityBombMunition" munitionamount=0 magazinesamount=10 />
+        <MunitionContainer munitiontype="MineMunition" munitionamount=0 magazinesamount=10 />
     </munitioncontainers>
   </MunitionPickup>