Changeset 3699

Timestamp:

Feb 6, 2006, 5:21:57 PM (18 years ago)

Author:

bensch

Message:

merged data from HeightMap

Location:

data/trunk

Files:

• pictures/colourmap2.bmp (copied) (copied from data/branches/height_map/pictures/colourmap2.bmp)
• pictures/ground1.tga (copied) (copied from data/branches/height_map/pictures/ground1.tga)
• pictures/heightmapHello1.bmp (copied) (copied from data/branches/height_map/pictures/heightmapHello1.bmp)
• worlds/DefaultCampaign.oxc (modified) (1 diff)
• worlds/Test.oxw (copied) (copied from data/branches/height_map/worlds/Test.oxw)

data/trunk/worlds/DefaultCampaign.oxc

@@ -20 +20 @@
 -->
 
-
-    <MovieLoader>
-      <identifier>1</identifier>
-      <nextid>2</nextid>
-      <name>Meteroid</name>
-      <movie>media/maya_orxonox_compressed.avi</movie>
-      <menu-entry>1</menu-entry>
-    </MovieLoader>
-
     <SinglePlayerWorld>
       <identifier>2</identifier>
       <nextid>3</nextid>
-      <path>worlds/MeteroidCinema.oxw</path>
+      <path>worlds/Test.oxw</path>
+      <menu-entry>1</menu-entry>
     </SinglePlayerWorld>