Changeset 3636

Timestamp:

Feb 3, 2006, 3:10:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/data: merged spaceshipcontrol back

Location:

data/trunk

Files:

• maps/Autobahnschild.png (copied) (copied from data/branches/spaceshipcontrol/maps/Autobahnschild.png)
• maps/absperrung.jpg (copied) (copied from data/branches/spaceshipcontrol/maps/absperrung.jpg)
• maps/brsmet12.gif (copied) (copied from data/branches/spaceshipcontrol/maps/brsmet12.gif)
• maps/brushedmetal.jpg (copied) (copied from data/branches/spaceshipcontrol/maps/brushedmetal.jpg)
• maps/endsign.png (copied) (copied from data/branches/spaceshipcontrol/maps/endsign.png)
• maps/skyscraper2_texture001.jpg (copied) (copied from data/branches/spaceshipcontrol/maps/skyscraper2_texture001.jpg)
• maps/uvw_map1.jpg (copied) (copied from data/branches/spaceshipcontrol/maps/uvw_map1.jpg)
• models/environments/desert.mtl (modified) (2 diffs)
• models/environments/desert.obj (modified) (previous)
• models/environments/desert_vegetation.mtl (copied) (copied from data/branches/spaceshipcontrol/models/environments/desert_vegetation.mtl)
• models/environments/desert_vegetation.obj (copied) (copied from data/branches/spaceshipcontrol/models/environments/desert_vegetation.obj)
• worlds/DefaultCampaign.oxc (modified) (1 diff)
• worlds/desert.oxw (copied) (copied from data/branches/spaceshipcontrol/worlds/desert.oxw)

data/trunk/models/environments/desert.mtl

@@ +1 @@
+newmtl blinn1SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.56 0.56 0.56
+Tf 1.00 1.00 1.00
+map_Kd bricks_wood.jpg
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl blinn2SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.44 0.44 0.44
+Tf 1.00 1.00 1.00
+map_Kd stucco.jpg
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl blinn3SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.43 0.43 0.43
+Tf 1.00 1.00 1.00
+map_Kd wood_knorr.jpg
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl blinn4SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd brsmet12.gif
+Ni 1.00
+Ks 0.50 0.50 0.50
+newmtl directionsign_lambert2SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd Autobahnschild.png
+Ni 1.00
+newmtl directionsign_lambert3SG
+illum 4
+Kd 0.00 0.00 0.00
+Ka 0.00 0.00 0.00
+Tf 1.00 1.00 1.00
+map_Kd brsmet12.gif
+Ni 1.00
 newmtl initialShadingGroup
 illum 4
@@ -8 +54 @@
 illum 4
 Kd 0.00 0.00 0.00
-Ka 0.20 0.20 0.20
+Ka 0.18 0.18 0.18
 Tf 1.00 1.00 1.00
 map_Kd sahara.jpg
 Ni 1.00
-Ks 0.64 0.30 0.00
-Ns 52.65
+Ks 1.00 0.61 0.42

data/trunk/worlds/DefaultCampaign.oxc

@@ -10 +10 @@
       <path>worlds/SimpleMenu.oxw</path>
     </SimpleGameMenu>
+
     <SinglePlayerWorld>
       <identifier>1</identifier>