[Orxonox-commit 3523] r8209 - in data/trunk: . gui/looknfeels images/effects materials
dafrick at orxonox.net
dafrick at orxonox.net
Fri Apr 8 00:16:54 CEST 2011
Author: dafrick
Date: 2011-04-08 00:16:54 +0200 (Fri, 08 Apr 2011)
New Revision: 8209
Added:
data/trunk/images/effects/blueplanet.png
data/trunk/images/effects/brownplanet.png
data/trunk/images/effects/greenplanet.png
data/trunk/images/effects/greyplanet.png
data/trunk/images/effects/redplanet.png
data/trunk/images/effects/violetplanet.png
data/trunk/images/effects/violetplanet2.png
data/trunk/materials/planets.material
Modified:
data/trunk/AUTHORS
data/trunk/gui/looknfeels/OrxonoxLook.looknfeel
data/trunk/materials/OrxonoxSky.material
Log:
Adding new planet billboards.
Modified: data/trunk/AUTHORS
===================================================================
--- data/trunk/AUTHORS 2011-04-07 20:53:16 UTC (rev 8208)
+++ data/trunk/AUTHORS 2011-04-07 22:16:54 UTC (rev 8209)
@@ -31,15 +31,15 @@
audio/ambient/eightbit/mainmenu.ogg H-Pizzle - Ghosts Of A Fallen Empire (All Hallows Eve in 8bit Hell), License: CC by-nc-sa 3.0 US
audio/ambient/eightbit/Mars.ogg Erik Skiff- Underclocked (Resistor Anthems), License: CC by 3.0 US
audio/ambient/eightbit/Nebula_metal.ogg Kevin Young - Samples (License: CC Sampling+) from: Sea Fury (Zap2) and Digifishmusic (Infinite Thunder)
-audio/ambient/jazz/AlphaCentauri.ogg cdk - Midnight Theme (cdk mix), License: CC by 3.0
-audio/ambient/jazz/Asteroid_rocks.ogg KCentric - OxyMoron, License: CC by 3.0
-audio/ambient/jazz/Earth.ogg echoed - Window like, License: CC by 3.0
-audio/ambient/jazz/Fight1.ogg Damian Frick - Samples (License: CC by 3.0) from: stefsax - Awel
-audio/ambient/jazz/Ganymede.ogg cdk - pieces of life, License: CC by 3.0
-audio/ambient/jazz/Jupiter.ogg gurdonark - Caper, CC by 3.0
-audio/ambient/jazz/mainmenu.ogg Citizen Nyx - Undercover, License: CC by 3.0
-audio/ambient/jazz/Mars.ogg shragrugge - Sax, Flute, n Glass, License: CC by 3.0
-audio/ambient/jazz/Nebula_metal.ogg Coriolis Effect - Mseq, License: CC by 3.0
+audio/ambient/jazzy/AlphaCentauri.ogg cdk - Midnight Theme (cdk mix), License: CC by 3.0
+audio/ambient/jazzy/Asteroid_rocks.ogg KCentric - OxyMoron, License: CC by 3.0
+audio/ambient/jazzy/Earth.ogg echoed - Window like, License: CC by 3.0
+audio/ambient/jazzy/Fight1.ogg Damian Frick - Samples (License: CC by 3.0) from: stefsax - Awel
+audio/ambient/jazzy/Ganymede.ogg cdk - pieces of life, License: CC by 3.0
+audio/ambient/jazzy/Jupiter.ogg gurdonark - Caper, CC by 3.0
+audio/ambient/jazzy/mainmenu.ogg Citizen Nyx - Undercover, License: CC by 3.0
+audio/ambient/jazzy/Mars.ogg shragrugge - Sax, Flute, n Glass, License: CC by 3.0
+audio/ambient/jazzy/Nebula_metal.ogg Coriolis Effect - Mseq, License: CC by 3.0
audio/sounds/Button_press1.ogg Corsica S - blip10, License: CC Sampling+
audio/sounds/Button_press2.ogg Corsica S - blip11, License: CC Sampling+
audio/sounds/Button_press3.ogg Corsica S - blip12, License: CC Sampling+
Modified: data/trunk/gui/looknfeels/OrxonoxLook.looknfeel
===================================================================
--- data/trunk/gui/looknfeels/OrxonoxLook.looknfeel 2011-04-07 20:53:16 UTC (rev 8208)
+++ data/trunk/gui/looknfeels/OrxonoxLook.looknfeel 2011-04-07 22:16:54 UTC (rev 8209)
@@ -2454,6 +2454,7 @@
<WidgetLook name="OrxonoxLook/StaticText">
<PropertyDefinition name="FrameColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" />
<PropertyDefinition name="BackgroundColours" initialValue="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" />
+ <Property name="TextColours" value="tl:FFFFFFFF tr:FFFFFFFF bl:FFFFFFFF br:FFFFFFFF" redrawOnWrite="true" />
<Property name="FrameEnabled" value="True" />
<Property name="BackgroundEnabled" value="True" />
<NamedArea name="WithFrameTextRenderArea">
Added: data/trunk/images/effects/blueplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/blueplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/brownplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/brownplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/greenplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/greenplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/greyplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/greyplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/redplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/redplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/violetplanet.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/violetplanet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: data/trunk/images/effects/violetplanet2.png
===================================================================
(Binary files differ)
Property changes on: data/trunk/images/effects/violetplanet2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: data/trunk/materials/OrxonoxSky.material
===================================================================
--- data/trunk/materials/OrxonoxSky.material 2011-04-07 20:53:16 UTC (rev 8208)
+++ data/trunk/materials/OrxonoxSky.material 2011-04-07 22:16:54 UTC (rev 8209)
@@ -52,6 +52,24 @@
}
}
+material Orxonox/Starbox2
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+
+ texture_unit
+ {
+ cubic_texture SkyboxFile.png separateUV
+ tex_address_mode clamp
+ }
+ }
+ }
+}
+
material Orxonox/StarSkyBox
{
technique
Added: data/trunk/materials/planets.material
===================================================================
--- data/trunk/materials/planets.material (rev 0)
+++ data/trunk/materials/planets.material 2011-04-07 22:16:54 UTC (rev 8209)
@@ -0,0 +1,126 @@
+material planets/blueplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture blueplanet.png
+ }
+ }
+ }
+}
+
+material planets/brownplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture brownplanet.png
+ }
+ }
+ }
+}
+
+material planets/greenplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture greenplanet.png
+ }
+ }
+ }
+}
+
+material planets/greyplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture greyplanet.png
+ }
+ }
+ }
+}
+
+material planets/redplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture redplanet.png
+ }
+ }
+ }
+}
+
+material planets/violetplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture violetplanet.png
+ }
+ }
+ }
+}
+
+material planets/violetplanet
+{
+ technique
+ {
+ pass
+ {
+ lighting off
+ depth_write off
+ scene_blend alpha_blend
+
+ texture_unit
+ {
+ texture violetplanet.png
+ }
+ }
+ }
+}
+
More information about the Orxonox-commit
mailing list