Changeset 4520

Timestamp:

Jan 26, 2007, 2:38:28 PM (17 years ago)

Author:

wenners

Message:

some errors corrected

Location:

data/contentcreation

Files:

• orx_artists/PatrickBoenzli/mount_point.blend (modified) (previous)
• pps/AdrianWaeber/human_spaceship_fighter.mtl (modified) (2 diffs)
• pps/AdrianWaeber/human_spaceship_fighter.obj (modified) (previous)
• pps/AndreaMoroniStampa/export_nowic (added)
• pps/AndreaMoroniStampa/export_nowic/Ragnar-finalcut-finaltext-withMP.blend (added)
• pps/AndreaMoroniStampa/export_nowic/pirates_spaceship_ragnar.mtl (added)
• pps/AndreaMoroniStampa/export_nowic/pirates_spaceship_ragnar.obj (added)
• pps/AndreaMoroniStampa/export_nowic/pirates_spaceship_ragnar.oif (added)
• pps/AndreaMoroniStampa/export_nowic/pirates_spaceship_ragnar_512.png (added)
• pps/AndreaMoroniStampa/pirates_mainstation_512.png (added)
• pps/MarcoDelai/pirates_spaceship_fighter.mtl (modified) (2 diffs)
• pps/MarcoDelai/pirates_spaceship_fighter.obj (modified) (previous)
• pps/SamBoegli/FinalProducts/SSTurret.mtl (modified) (1 diff)
• pps/SamBoegli/FinalProducts/ZHARA_Space_Station_1024.png (added)
• pps/SamBoegli/FinalProducts/ZHARA_Space_Station_2048.png (added)
• pps/SamBoegli/FinalProducts/ZHARA_Space_Station_2096.png (deleted)
• pps/SamBoegli/FinalProducts/export_nowic (added)
• pps/SamBoegli/FinalProducts/export_nowic/ZHARA_Space_Station.mtl (added)
• pps/SamBoegli/FinalProducts/export_nowic/ZHARA_Space_Station.obj (added)
• pps/SamBoegli/FinalProducts/export_nowic/ZHARA_Space_Station.oif (added)
• pps/SamBoegli/FinalProducts/export_nowic/ZHARA_Space_Station_1024.png (added)

data/contentcreation/pps/AdrianWaeber/human_spaceship_fighter.mtl

@@ -1 +1 @@
 # Blender3D MTL File: human_spaceship_fighter.blend
-# Material Count: 1
+# Material Count: 2
 newmtl (null)
 Ns 96.078431
@@ -11 +11 @@
 
 
+newmtl Material_human_spaceship_f.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd human_spaceship_fighter_512.png
+
+

data/contentcreation/pps/MarcoDelai/pirates_spaceship_fighter.mtl

@@ -1 +1 @@
 # Blender3D MTL File: pirates_spaceship_fighter.blend
-# Material Count: 1
+# Material Count: 2
+newmtl (null)
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+
+
 newmtl Material_pirates_spaceship_fig
 Ns 96.078431
@@ -9 +19 @@
 d 1.000000
 illum 2
-map_Kd pirates_spaceship_fighter_512.png
+map_Kd pirates_spaceship_fighter_256.png
 
 

data/contentcreation/pps/SamBoegli/FinalProducts/SSTurret.mtl

@@ +1 @@
+<<<<<<< .mine
+# Blender3D MTL File: Turret.blend
+# Material Count: 1
+newmtl Material.001_Turret.jpeg.001
+Ns 96.078431
+Ka 0.000000 0.000000 0.000000
+Kd 0.640000 0.640000 0.640000
+Ks 0.500000 0.500000 0.500000
+Ni 1.000000
+d 1.000000
+illum 2
+map_Kd SSTurret_256.png
+
+
+=======
 # Blender3D MTL File: Turret.blend
 # Material Count: 0
+>>>>>>> .r1144