Changeset 3590

Timestamp:

Jan 30, 2006, 3:04:44 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the data/network back here, as without it orxonox is not playable anymore

Location:

data/trunk

Files:

• pictures/error_texture.png (copied) (copied from data/branches/network/pictures/error_texture.png)
• pictures/lense_flare (copied) (copied from data/branches/network/pictures/lense_flare)
• pictures/lense_flare/lens1.jpg (copied) (copied from data/branches/network/pictures/lense_flare/lens1.jpg)
• pictures/lense_flare/lens2.jpg (copied) (copied from data/branches/network/pictures/lense_flare/lens2.jpg)
• pictures/lense_flare/lens3.jpg (copied) (copied from data/branches/network/pictures/lense_flare/lens3.jpg)
• pictures/lense_flare/lens4.jpg (copied) (copied from data/branches/network/pictures/lense_flare/lens4.jpg)
• pictures/load_screen_bar_simple.png (copied) (copied from data/branches/network/pictures/load_screen_bar_simple.png)
• pictures/load_screen_simple.jpg (copied) (copied from data/branches/network/pictures/load_screen_simple.jpg)
• pictures/marsmap.png (copied) (copied from data/branches/network/pictures/marsmap.png)
• pictures/menu (copied) (copied from data/branches/network/pictures/menu)
• pictures/menu/error_512x128.png (copied) (copied from data/branches/network/pictures/menu/error_512x128.png)
• pictures/menu/multiplayer_512x128_normal.png (copied) (copied from data/branches/network/pictures/menu/multiplayer_512x128_normal.png)
• pictures/menu/quit_512x128_normal.png (copied) (copied from data/branches/network/pictures/menu/quit_512x128_normal.png)
• pictures/menu/se_christmas_512x128.png (copied) (copied from data/branches/network/pictures/menu/se_christmas_512x128.png)
• pictures/menu/se_default_512x128.png (copied) (copied from data/branches/network/pictures/menu/se_default_512x128.png)
• pictures/menu/se_straight_512x128.png (copied) (copied from data/branches/network/pictures/menu/se_straight_512x128.png)
• pictures/menu/se_vulcano_512x128.png (copied) (copied from data/branches/network/pictures/menu/se_vulcano_512x128.png)
• pictures/menu/selector.png (copied) (copied from data/branches/network/pictures/menu/selector.png)
• pictures/menu/selector_512x128.png (copied) (copied from data/branches/network/pictures/menu/selector_512x128.png)
• pictures/menu/start_game_512x128_normal.png (copied) (copied from data/branches/network/pictures/menu/start_game_512x128_normal.png)
• pictures/menu/start_game_512x128_selected.png (copied) (copied from data/branches/network/pictures/menu/start_game_512x128_selected.png)
• pictures/plutomap.png (copied) (copied from data/branches/network/pictures/plutomap.png)
• pictures/sky/simple_space_back.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_back.jpg)
• pictures/sky/simple_space_bottom.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_bottom.jpg)
• pictures/sky/simple_space_front.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_front.jpg)
• pictures/sky/simple_space_left.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_left.jpg)
• pictures/sky/simple_space_right.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_right.jpg)
• pictures/sky/simple_space_top.jpg (copied) (copied from data/branches/network/pictures/sky/simple_space_top.jpg)
• pictures/sky/space (copied) (copied from data/branches/network/pictures/sky/space)
• pictures/sky/space/space_back.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_back.jpg)
• pictures/sky/space/space_bottom.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_bottom.jpg)
• pictures/sky/space/space_front.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_front.jpg)
• pictures/sky/space/space_left.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_left.jpg)
• pictures/sky/space/space_right.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_right.jpg)
• pictures/sky/space/space_top.jpg (copied) (copied from data/branches/network/pictures/sky/space/space_top.jpg)
• worlds/DefaultCampaign.oxc (modified) (1 diff)
• worlds/SimpleMenu.oxw (copied) (copied from data/branches/network/worlds/SimpleMenu.oxw)
• worlds/Straight.oxw (modified) (1 diff)

data/trunk/worlds/DefaultCampaign.oxc

@@ -4 +4 @@
   <description>The one and only default debug campaign</description>
   <WorldList>
-    <SinglePlayerWorld>
+    <SimpleGameMenu>
       <identifier>0</identifier>
+      <name>World1</name>
       <nextid>1</nextid>
-      <path>worlds/Straight.oxw</path>
-    </SinglePlayerWorld>
+      <path>worlds/SimpleMenu.oxw</path>
+    </SimpleGameMenu>
     <SinglePlayerWorld>
       <identifier>1</identifier>
+      <name>World2</name>
       <nextid>2</nextid>
-      <path>worlds/christmas.oxw</path>
+      <path>worlds/Straight.oxw</path>
+      <menu-entry>1</menu-entry>
+      <menu-item-image>pictures/menu/se_straight_512x128.png</menu-item-image>
+      <screenshoot></screenshoot>
     </SinglePlayerWorld>
     <SinglePlayerWorld>
       <identifier>2</identifier>
+      <name>World3</name>
       <nextid>3</nextid>
-      <path>worlds/DefaultWorld.oxw</path>
+      <path>worlds/christmas.oxw</path>
+      <menu-entry>1</menu-entry>
+      <menu-item-image>pictures/menu/se_christmas_512x128.png</menu-item-image>
+      <screenshoot></screenshoot>
     </SinglePlayerWorld>
     <SinglePlayerWorld>
       <identifier>3</identifier>
+      <name>World4</name>
       <nextid>4</nextid>
-      <path>worlds/vulcania.oxw</path>
+      <path>worlds/DefaultWorld.oxw</path>
+      <menu-entry>1</menu-entry>
+      <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
+      <screenshoot></screenshoot>
     </SinglePlayerWorld>
     <SinglePlayerWorld>
       <identifier>4</identifier>
+      <name>World5</name>
+      <nextid>5</nextid>
+      <path>worlds/vulcania.oxw</path>
+      <menu-entry>1</menu-entry>
+      <menu-item-image>pictures/menu/se_vulcano_512x128.png</menu-item-image>
+      <screenshoot></screenshoot>
+    </SinglePlayerWorld>
+    <SinglePlayerWorld>
+      <identifier>5</identifier>
+      <name>World6</name>
       <nextid>999</nextid>
       <path>worlds/World2.oxw</path>
+      <menu-entry>1</menu-entry>
+      <menu-item-image>pictures/menu/se_default_512x128.png</menu-item-image>
+      <screenshoot></screenshoot>
     </SinglePlayerWorld>
   </WorldList>

data/trunk/worlds/Straight.oxw

@@ -111 +111 @@
   </LightManager>
   <Music>sound/00-luke_grey_-_hypermode.ogg</Music>
-
+  <FogEffect>
+    <fog-mode>GL_LINEAR</fog-mode>
+    <fog-range>10.0, 1000.0</fog-range>
+  </FogEffect>
 </WorldDataFile>