[Orxonox-commit 1272] r5990 - in data/trunk/materials: scripts textures
rgrieder at orxonox.net
rgrieder at orxonox.net
Fri Oct 23 14:14:40 CEST 2009
Author: rgrieder
Date: 2009-10-23 14:14:40 +0200 (Fri, 23 Oct 2009)
New Revision: 5990
Modified:
data/trunk/materials/scripts/OrxonoxSky.material
data/trunk/materials/textures/console2.tga
data/trunk/materials/textures/console3.tga
Log:
Merged revisions from data png branch to the trunk (got the wrong default branch on my system).
You should now have a readable console in the menu.
Modified: data/trunk/materials/scripts/OrxonoxSky.material
===================================================================
--- data/trunk/materials/scripts/OrxonoxSky.material 2009-10-23 11:17:42 UTC (rev 5989)
+++ data/trunk/materials/scripts/OrxonoxSky.material 2009-10-23 12:14:40 UTC (rev 5990)
@@ -131,8 +131,6 @@
pass
{
- depth_writing off
-
texture_unit
{
texture sample_loading.jpg
Modified: data/trunk/materials/textures/console2.tga
===================================================================
(Binary files differ)
Modified: data/trunk/materials/textures/console3.tga
===================================================================
(Binary files differ)
More information about the Orxonox-commit
mailing list