Changeset 12180 for code/branches/Merge_HS18/data/levels/templates

Timestamp:

Dec 11, 2018, 2:52:30 PM (6 years ago)

Author:

merholzl

Message:

World Map merging

Location:

code/branches/Merge_HS18

Files:

• . (modified) (1 prop)
• data/levels/templates/MapExample.oxt (copied) (copied from code/branches/WorldMap_HS18/data/levels/templates/MapExample.oxt)
• data/levels/templates/StoryMode.oxt (modified) (1 diff)
• data/levels/templates/StoryModeEscort.oxt (modified) (1 diff)

code/branches/Merge_HS18/data/levels/templates/StoryMode.oxt

@@ -1 +1 @@
 <Template name=StoryMode>
-  <Pawn
+  <StoryModeController
    hudtemplate            = StoryModeMap
   />

code/branches/Merge_HS18/data/levels/templates/StoryModeEscort.oxt

@@ -43 +43 @@
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=4 mesh="escortShip.mesh" />
+      <Model position="0,0,0" yaw=90 pitch=0 roll=0 scale=20 mesh="escortShip.mesh" />
       <Model position="0,0,0" yaw=180 pitch=90 roll=0 scale=4 mesh="escortWeapon.mesh" />
 <!--Model mesh="cube.mesh" mass=10 position="0,0,3" scale3D="10,4,8" />