Changeset 3631

Timestamp:

Feb 3, 2006, 12:33:04 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Data from the MoviePlayer guys here

Location:

data/trunk

Files:

• maps/hull38L.tga (copied) (copied from data/branches/avi_play/maps/hull38L.tga)
• maps/hull46L.jpg (copied) (copied from data/branches/avi_play/maps/hull46L.jpg)
• models/ships/powerdrifter.mtl (copied) (copied from data/branches/avi_play/models/ships/powerdrifter.mtl)
• models/ships/powerdrifter.obj (copied) (copied from data/branches/avi_play/models/ships/powerdrifter.obj)
• models/ships/warcruiser.mtl (copied) (copied from data/branches/avi_play/models/ships/warcruiser.mtl)
• models/ships/warcruiser.obj (copied) (copied from data/branches/avi_play/models/ships/warcruiser.obj)
• worlds/AviPlay.oxw (copied) (copied from data/branches/avi_play/worlds/AviPlay.oxw) (1 diff)
• worlds/DefaultCampaign.oxc (modified) (2 diffs)
• worlds/Straight.oxw (modified) (1 diff)
• worlds/World2.oxw (modified) (1 diff)
• worlds/christmas.oxw (modified) (1 diff)
• worlds/vulcania.oxw (modified) (1 diff)

data/trunk/worlds/AviPlay.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>MeteroidCinema</name>
+  <menu-item-image>pictures/menu/se_straight_512x128.png</menu-item-image>
+  <screenshoot>pictures/menu/ss_straight_512x512.png</screenshoot>
+
   <LoadScreen>
     <BackgroundImage>pictures/load_screen.jpg</BackgroundImage>

data/trunk/worlds/DefaultCampaign.oxc

@@ -4 +4 @@
   <description>The one and only default debug campaign</description>
   <WorldList>
+
     <SimpleGameMenu>
       <identifier>0</identifier>
       <name>GameMenu</name>
-      <nextid>1</nextid>
       <path>worlds/SimpleMenu.oxw</path>
     </SimpleGameMenu>
-
     <SinglePlayerWorld>
       <identifier>1</identifier>
       <nextid>2</nextid>
       <path>worlds/Straight.oxw</path>
+      <menu-entry>1</menu-entry>
     </SinglePlayerWorld>
+
+
+<!--
+    <MovieLoader>
+      <identifier>1</identifier>
+      <nextid>2</nextid>
+      <name>media/orxonox-logo.avi</name>
+      <menu-entry>1</menu-entry>
+    </MovieLoader>
 
     <SinglePlayerWorld>
       <identifier>2</identifier>
       <nextid>3</nextid>
-      <path>worlds/christmas.oxw</path>
+      <path>worlds/AviPlay.oxw</path>
     </SinglePlayerWorld>
-
+-->
     <SinglePlayerWorld>
       <identifier>3</identifier>
       <nextid>4</nextid>
-      <path>worlds/DefaultWorld.oxw</path>
+      <path>worlds/christmas.oxw</path>
+      <menu-entry>1</menu-entry>
     </SinglePlayerWorld>
 
@@ -32 +42 @@
       <identifier>4</identifier>
       <nextid>5</nextid>
-      <path>worlds/vulcania.oxw</path>
+      <path>worlds/DefaultWorld.oxw</path>
+      <menu-entry>1</menu-entry>
     </SinglePlayerWorld>
 
     <SinglePlayerWorld>
       <identifier>5</identifier>
+      <nextid>6</nextid>
+      <path>worlds/vulcania.oxw</path>
+      <menu-entry>1</menu-entry>
+    </SinglePlayerWorld>
+
+    <SinglePlayerWorld>
+      <identifier>6</identifier>
       <nextid>999</nextid>
       <path>worlds/World2.oxw</path>
+      <menu-entry>1</menu-entry>
     </SinglePlayerWorld>
 

data/trunk/worlds/Straight.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>Straight</name>
-  <menu-entry>1</menu-entry>
   <menu-item-image>pictures/menu/se_straight_512x128.png</menu-item-image>
   <screenshoot>pictures/menu/ss_straight_512x512.png</screenshoot>

data/trunk/worlds/World2.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>Darkness</name>
-  <menu-entry>1</menu-entry>
   <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
   <screenshoot>pictures/menu/ss_default_512x512.png</screenshoot>

data/trunk/worlds/christmas.oxw

@@ -2 +2 @@
   <name>Christmas</name>
   <description>This is the Demo Level for the christmas eve level.</description>
-  <menu-entry>1</menu-entry>
   <menu-item-image>pictures/menu/se_christmas_512x128.png</menu-item-image>
   <screenshoot>pictures/menu/ss_christmas_512x512.png</screenshoot>

data/trunk/worlds/vulcania.oxw

@@ -1 +1 @@
 <WorldDataFile>
   <name>Vulcania</name>
-  <menu-entry>1</menu-entry>
   <menu-item-image>pictures/menu/se_vulcano_512x128.png</menu-item-image>
   <screenshoot>pictures/menu/ss_vulcano_512x512.png</screenshoot>