[Orxonox-commit 4689] r9360 - in data/branches/dataRelease2012: images/levelpreviews images/overlay images/textures materials models
jo at orxonox.net
jo at orxonox.net
Sat Sep 1 17:07:19 CEST 2012
Author: jo
Date: 2012-09-01 17:07:19 +0200 (Sat, 01 Sep 2012)
New Revision: 9360
Added:
data/branches/dataRelease2012/models/Spacegate.mesh
Removed:
data/branches/dataRelease2012/images/levelpreviews/asteroidFieldTest.png
data/branches/dataRelease2012/images/levelpreviews/codingtutorial.png
data/branches/dataRelease2012/images/levelpreviews/earthdemonstration.png
data/branches/dataRelease2012/images/levelpreviews/emptylevel.png
data/branches/dataRelease2012/images/levelpreviews/eventsshowcase.png
data/branches/dataRelease2012/images/levelpreviews/fpstestlevel.png
data/branches/dataRelease2012/images/levelpreviews/mytestlevel.png
data/branches/dataRelease2012/images/levelpreviews/notificationsshowcase.png
data/branches/dataRelease2012/images/levelpreviews/pickupsshowcase.png
data/branches/dataRelease2012/images/levelpreviews/planetdemonstration.png
data/branches/dataRelease2012/images/levelpreviews/portals.png
data/branches/dataRelease2012/images/levelpreviews/presentation.png
data/branches/dataRelease2012/images/levelpreviews/presentationdm.png
data/branches/dataRelease2012/images/levelpreviews/presentationfs11.png
data/branches/dataRelease2012/images/levelpreviews/presentationx1st.png
data/branches/dataRelease2012/images/levelpreviews/presentationx2.png
data/branches/dataRelease2012/images/levelpreviews/presentationx2nd.png
data/branches/dataRelease2012/images/levelpreviews/presentationx3rd.png
data/branches/dataRelease2012/images/levelpreviews/presentationxi.png
data/branches/dataRelease2012/images/levelpreviews/presentationxifps1st.png
data/branches/dataRelease2012/images/levelpreviews/presentationxifps2nd.png
data/branches/dataRelease2012/images/levelpreviews/questsshowcase.png
data/branches/dataRelease2012/images/levelpreviews/screenshot.png
data/branches/dataRelease2012/images/levelpreviews/shieldtestlevel.png
data/branches/dataRelease2012/images/levelpreviews/soundshowcase.png
data/branches/dataRelease2012/images/levelpreviews/starstestlevel.png
data/branches/dataRelease2012/images/levelpreviews/swallowtestlevel.png
data/branches/dataRelease2012/images/levelpreviews/waypointstestlevel.png
data/branches/dataRelease2012/images/overlay/DroneBanner.png
data/branches/dataRelease2012/images/overlay/Formation.png
data/branches/dataRelease2012/images/overlay/Pickups.png
data/branches/dataRelease2012/images/textures/can.png
data/branches/dataRelease2012/images/textures/cokelabel.jpg
data/branches/dataRelease2012/images/textures/playfield_top.png
data/branches/dataRelease2012/images/textures/stunweapon.png
data/branches/dataRelease2012/images/textures/tiled_floor.jpg
data/branches/dataRelease2012/materials/Playfield.material
data/branches/dataRelease2012/materials/Spacebomb.material
data/branches/dataRelease2012/materials/Tower.material
data/branches/dataRelease2012/materials/axes.material
data/branches/dataRelease2012/materials/can.material
data/branches/dataRelease2012/materials/cokebottle.material
data/branches/dataRelease2012/materials/plane.material
data/branches/dataRelease2012/materials/planet.material
data/branches/dataRelease2012/materials/stunweapon.material
data/branches/dataRelease2012/models/Playfield_ME.mesh
data/branches/dataRelease2012/models/Spacebomb.mesh
data/branches/dataRelease2012/models/Spacegate.mesh
data/branches/dataRelease2012/models/Tower.mesh
data/branches/dataRelease2012/models/Tower_ME.mesh
data/branches/dataRelease2012/models/axes.mesh
data/branches/dataRelease2012/models/can.mesh
data/branches/dataRelease2012/models/cokebottle.mesh
data/branches/dataRelease2012/models/plane.mesh
data/branches/dataRelease2012/models/planet.mesh
data/branches/dataRelease2012/models/stunweapon.mesh
Log:
I removed all models+materials+textures that seem unneccesary to me. Additonally most levelpreviews have been removed.
Deleted: data/branches/dataRelease2012/images/levelpreviews/asteroidFieldTest.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/codingtutorial.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/earthdemonstration.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/emptylevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/eventsshowcase.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/fpstestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/mytestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/notificationsshowcase.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/pickupsshowcase.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/planetdemonstration.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/portals.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentation.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationdm.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationfs11.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationx1st.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationx2.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationx2nd.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationx3rd.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationxi.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationxifps1st.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/presentationxifps2nd.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/questsshowcase.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/screenshot.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/shieldtestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/soundshowcase.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/starstestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/swallowtestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/levelpreviews/waypointstestlevel.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/overlay/DroneBanner.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/overlay/Formation.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/overlay/Pickups.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/textures/can.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/textures/cokelabel.jpg
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/textures/playfield_top.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/textures/stunweapon.png
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/images/textures/tiled_floor.jpg
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/materials/Playfield.material
===================================================================
--- data/branches/dataRelease2012/materials/Playfield.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/Playfield.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,20 +0,0 @@
-material PlayField
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.640000 0.640000 0.640000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture playfield_top.png
- tex_address_mode wrap
- filtering trilinear
- }
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/Spacebomb.material
===================================================================
--- data/branches/dataRelease2012/materials/Spacebomb.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/Spacebomb.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,28 +0,0 @@
-material spacebom_metal
-{
- receive_shadows on
- technique
- {
- pass
- {
- //ambient 0.500000 0.500000 0.500000 1.000000
- //diffuse 0.800000 0.800000 0.800000 1.000000
- //emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture sl_metal_016.png
- scale 0.1 0.1
- //tex_address_mode wrap
- //filtering trilinear
- //colour_op modulate
- }
- }
-// pass
-// {
-// ambient 0.0 0.0 0.0
-// diffuse 0.0 0.0 0.0
-// specular 0.292481 0.277763 0.277763 1.000000 12.500000
-// scene_blend add
-// }
- }
-}
Deleted: data/branches/dataRelease2012/materials/Tower.material
===================================================================
--- data/branches/dataRelease2012/materials/Tower.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/Tower.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,25 +0,0 @@
-material Material/TEXFACE/RustySteel.jpg
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture RustySteel.jpg
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/axes.material
===================================================================
--- data/branches/dataRelease2012/materials/axes.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/axes.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,56 +0,0 @@
-material blue
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.092061 0.000000 0.800000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- }
- }
-}
-material green
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.000000 0.800000 0.000000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- }
- }
-}
-material grey
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.448000 0.448000 0.448000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- }
- }
-}
-material red
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.000000 0.000000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/can.material
===================================================================
--- data/branches/dataRelease2012/materials/can.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/can.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,25 +0,0 @@
-material can/TEXFACE/can.tga
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture can.png
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/cokebottle.material
===================================================================
--- data/branches/dataRelease2012/materials/cokebottle.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/cokebottle.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,62 +0,0 @@
-material cokebottle
-{
- receive_shadows on
- technique
- {
- pass
- {
-
- scene_blend alpha_blend
- depth_write off
- ambient 1.000000 1.000000 1.000000 0.500000
- diffuse 0.640000 0.640000 0.640000 0.500000
- specular 0.500000 0.500000 0.500000 0.500000 12.500000
- emissive 0.000000 0.000000 0.000000 0.500000
-
- texture_unit
- {
- colour_op_ex source1 src_manual src_current 175 238 238
- alpha_op_ex source1 src_manual src_current 0.5
- }
- }
- }
-}
-material label/TEXFACE
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 1.000000 1.000000 1.000000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- emissive 0.000000 0.000000 0.000000 1.000000
- }
- }
-}
-material label/TEXFACE/cokelabel.jpg
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 1.000000 1.000000 1.000000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture cokelabel.jpg
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/plane.material
===================================================================
--- data/branches/dataRelease2012/materials/plane.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/plane.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,20 +0,0 @@
-
-material Ac3d/Plane/Mat001_Tex00
-{
- technique
- {
- pass
- {
- ambient 1 1 1 1
- diffuse 1 1 1 1
- specular 0.75 0.75 1 1 10
-
- texture_unit
- {
- texture tiled_floor.jpg
- filtering anisotropic
- max_anisotropy 8
- }
- }
- }
-}
Deleted: data/branches/dataRelease2012/materials/planet.material
===================================================================
--- data/branches/dataRelease2012/materials/planet.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/planet.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,71 +0,0 @@
-material planet/TEXFACE/planet.jpg
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 10.800000 10.800000 10.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
-
- texture_unit
- {
- texture planet1024.jpg
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.000000 0.000000 0.000000 1.000000 12.500000
- scene_blend add
- }
- }
-}
-
-
-material planet/Atmosphere
-{
- receive_shadows on
- technique
- {
- pass
- {
- depth_write off
- lighting off
- scene_blend alpha_blend
- depth_check on
-
- texture_unit
- {
- texture atmospheretype3.png
- }
- }
- }
-}
-
-
-material atmosphere1
-{
- receive_shadows on
- technique
- {
- pass
- {
- depth_write off
- lighting off
- scene_blend alpha_blend
- depth_check on
-
- texture_unit
- {
- texture atmospheretype1.png
- }
- }
- }
-}
-
-
-
Deleted: data/branches/dataRelease2012/materials/stunweapon.material
===================================================================
--- data/branches/dataRelease2012/materials/stunweapon.material 2012-09-01 15:04:18 UTC (rev 9359)
+++ data/branches/dataRelease2012/materials/stunweapon.material 2012-09-01 15:07:19 UTC (rev 9360)
@@ -1,25 +0,0 @@
-material stunweaponmaterial/TEXFACE/model1-UV_Cylinder_firsttry.tga
-{
- receive_shadows on
- technique
- {
- pass
- {
- ambient 0.500000 0.500000 0.500000 1.000000
- diffuse 0.800000 0.800000 0.800000 1.000000
- emissive 0.000000 0.000000 0.000000 1.000000
- texture_unit
- {
- texture model1-UV_Cylinder_firsttry.png
- colour_op modulate
- }
- }
- pass
- {
- ambient 0.0 0.0 0.0
- diffuse 0.0 0.0 0.0
- specular 0.500000 0.500000 0.500000 1.000000 12.500000
- scene_blend add
- }
- }
-}
Deleted: data/branches/dataRelease2012/models/Playfield_ME.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/Spacebomb.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/Spacegate.mesh
===================================================================
(Binary files differ)
Added: data/branches/dataRelease2012/models/Spacegate.mesh
===================================================================
(Binary files differ)
Property changes on: data/branches/dataRelease2012/models/Spacegate.mesh
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: data/branches/dataRelease2012/models/Tower.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/Tower_ME.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/axes.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/can.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/cokebottle.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/plane.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/planet.mesh
===================================================================
(Binary files differ)
Deleted: data/branches/dataRelease2012/models/stunweapon.mesh
===================================================================
(Binary files differ)
More information about the Orxonox-commit
mailing list