[Orxonox-commit 7454] r12061 - in data/data_extern: . images/levelpreviews images/textures materials models
merholzl at orxonox.net
merholzl at orxonox.net
Wed Oct 31 10:52:15 CET 2018
Author: merholzl
Date: 2018-10-31 10:52:15 +0100 (Wed, 31 Oct 2018)
New Revision: 12061
Added:
data/data_extern/images/levelpreviews/Pacman.png
data/data_extern/images/textures/PacmanAfraidGhost.PNG
data/data_extern/images/textures/PacmanGelb.PNG
data/data_extern/images/textures/PacmanGhostBlue.PNG
data/data_extern/images/textures/PacmanGhostOrange.PNG
data/data_extern/images/textures/PacmanGhostPink.PNG
data/data_extern/images/textures/PacmanGhostRed.PNG
data/data_extern/images/textures/PacmanMap.PNG
data/data_extern/images/textures/PacmanPointAfraid.PNG
data/data_extern/images/textures/PacmanPointSphere.PNG
data/data_extern/materials/PacmanAfraidGhost.material
data/data_extern/materials/PacmanGelb.material
data/data_extern/materials/PacmanGhostBlue.material
data/data_extern/materials/PacmanGhostOrange.material
data/data_extern/materials/PacmanGhostPink.material
data/data_extern/materials/PacmanGhostRed.material
data/data_extern/materials/PacmanMap.material
data/data_extern/materials/PacmanPointAfraid.material
data/data_extern/materials/PacmanPointSphere.material
data/data_extern/models/PacmanAfraidGhost.mesh
data/data_extern/models/PacmanGelb.mesh
data/data_extern/models/PacmanGhostBlue.mesh
data/data_extern/models/PacmanGhostOrange.mesh
data/data_extern/models/PacmanGhostPink.mesh
data/data_extern/models/PacmanGhostRed.mesh
data/data_extern/models/PacmanMap.mesh
data/data_extern/models/PacmanPointAfraid.mesh
data/data_extern/models/PacmanPointSphere.mesh
Modified:
data/data_extern/
Log:
Final Pacman merge
Index: data/data_extern
===================================================================
--- data/data_extern 2018-10-31 09:40:50 UTC (rev 12060)
+++ data/data_extern 2018-10-31 09:52:15 UTC (rev 12061)
Property changes on: data/data_extern
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
/data/branches/altaudio:6211-6263
/data/branches/cegui0.8:11119-11793
+/data/branches/cegui0.8_ogre1.9:12033-12060
/data/branches/cleanup:7470-7685
/data/branches/media_stripped:5591-5657
/data/branches/png2:7245-7260
\ No newline at end of property
Copied: data/data_extern/images/levelpreviews/Pacman.png (from rev 12060, data/branches/cegui0.8_ogre1.9/images/levelpreviews/Pacman.png)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanAfraidGhost.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanAfraidGhost.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanGelb.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanGelb.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanGhostBlue.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostBlue.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanGhostOrange.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostOrange.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanGhostPink.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostPink.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanGhostRed.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanGhostRed.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanMap.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanMap.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanPointAfraid.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanPointAfraid.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/images/textures/PacmanPointSphere.PNG (from rev 12060, data/branches/cegui0.8_ogre1.9/images/textures/PacmanPointSphere.PNG)
===================================================================
(Binary files differ)
Copied: data/data_extern/materials/PacmanAfraidGhost.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanAfraidGhost.material)
===================================================================
--- data/data_extern/materials/PacmanAfraidGhost.material (rev 0)
+++ data/data_extern/materials/PacmanAfraidGhost.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanAfraidGhost genrated by blender2ogre 0.6.0
+
+material PacmanAfraidGhost
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanAfraidGhost
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanAfraidGhost.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanGelb.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanGelb.material)
===================================================================
--- data/data_extern/materials/PacmanGelb.material (rev 0)
+++ data/data_extern/materials/PacmanGelb.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanGelb genrated by blender2ogre 0.6.0
+
+material PacmanGelb
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanGelb
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanGelb.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanGhostBlue.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanGhostBlue.material)
===================================================================
--- data/data_extern/materials/PacmanGhostBlue.material (rev 0)
+++ data/data_extern/materials/PacmanGhostBlue.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanGhostBlue genrated by blender2ogre 0.6.0
+
+material PacmanGhostBlue
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanGhostBlue
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanGhostBlue.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanGhostOrange.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanGhostOrange.material)
===================================================================
--- data/data_extern/materials/PacmanGhostOrange.material (rev 0)
+++ data/data_extern/materials/PacmanGhostOrange.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanGhostOrange genrated by blender2ogre 0.6.0
+
+material PacmanGhostOrange
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanGhostOrange
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanGhostOrange.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanGhostPink.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanGhostPink.material)
===================================================================
--- data/data_extern/materials/PacmanGhostPink.material (rev 0)
+++ data/data_extern/materials/PacmanGhostPink.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanGhostPink genrated by blender2ogre 0.6.0
+
+material PacmanGhostPink
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanGhostPink
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanGhostPink.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanGhostRed.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanGhostRed.material)
===================================================================
--- data/data_extern/materials/PacmanGhostRed.material (rev 0)
+++ data/data_extern/materials/PacmanGhostRed.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanGhostRed genrated by blender2ogre 0.6.0
+
+material PacmanGhostRed
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanGhostRed
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanGhostRed.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanMap.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanMap.material)
===================================================================
--- data/data_extern/materials/PacmanMap.material (rev 0)
+++ data/data_extern/materials/PacmanMap.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanMap genrated by blender2ogre 0.6.0
+
+material PacmanMap
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanMap
+ {
+ ambient 0.9113900661468506 0.6212117075920105 0.7106964588165283 1.0
+ diffuse 0.7291120637820967 0.49696937347902903 0.5685571755253847 1.0
+ specular 0.5 0.41608479619026184 0.45826786756515503 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanMap.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanPointAfraid.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanPointAfraid.material)
===================================================================
--- data/data_extern/materials/PacmanPointAfraid.material (rev 0)
+++ data/data_extern/materials/PacmanPointAfraid.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanPointAfraid genrated by blender2ogre 0.6.0
+
+material PacmanPointAfraid
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanPointAfraid
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanPointSphere.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/materials/PacmanPointSphere.material (from rev 12060, data/branches/cegui0.8_ogre1.9/materials/PacmanPointSphere.material)
===================================================================
--- data/data_extern/materials/PacmanPointSphere.material (rev 0)
+++ data/data_extern/materials/PacmanPointSphere.material 2018-10-31 09:52:15 UTC (rev 12061)
@@ -0,0 +1,42 @@
+// PacmanPointSphere genrated by blender2ogre 0.6.0
+
+material PacmanPointSphere
+{
+ receive_shadows on
+
+ technique
+ {
+ pass PacmanPointSphere
+ {
+ ambient 0.800000011920929 0.800000011920929 0.800000011920929 1.0
+ diffuse 0.6400000190734865 0.6400000190734865 0.6400000190734865 1.0
+ specular 0.5 0.5 0.5 1.0 12.5
+ emissive 0.0 0.0 0.0 1.0
+
+ alpha_to_coverage off
+ colour_write on
+ cull_hardware clockwise
+ depth_check on
+ depth_func less_equal
+ depth_write on
+ illumination_stage
+ light_clip_planes off
+ light_scissor off
+ lighting on
+ normalise_normals off
+ polygon_mode solid
+ scene_blend one zero
+ scene_blend_op add
+ shading gouraud
+ transparent_sorting on
+
+ texture_unit
+ {
+ texture PacmanPointSphere.PNG
+ tex_address_mode wrap
+ scale 1.0 1.0
+ colour_op modulate
+ }
+ }
+ }
+}
Copied: data/data_extern/models/PacmanAfraidGhost.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanAfraidGhost.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanGelb.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanGelb.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanGhostBlue.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanGhostBlue.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanGhostOrange.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanGhostOrange.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanGhostPink.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanGhostPink.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanGhostRed.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanGhostRed.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanMap.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanMap.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanPointAfraid.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanPointAfraid.mesh)
===================================================================
(Binary files differ)
Copied: data/data_extern/models/PacmanPointSphere.mesh (from rev 12060, data/branches/cegui0.8_ogre1.9/models/PacmanPointSphere.mesh)
===================================================================
(Binary files differ)
More information about the Orxonox-commit
mailing list