Changeset 8209

Timestamp:

Apr 8, 2011, 12:16:54 AM (14 years ago)

Author:

dafrick

Message:

Adding new planet billboards.

Location:

data/trunk

Files:

• AUTHORS (modified) (1 diff)
• gui/looknfeels/OrxonoxLook.looknfeel (modified) (1 diff)
• images/effects/blueplanet.png (added)
• images/effects/brownplanet.png (added)
• images/effects/greenplanet.png (added)
• images/effects/greyplanet.png (added)
• images/effects/redplanet.png (added)
• images/effects/violetplanet.png (added)
• images/effects/violetplanet2.png (added)
• materials/OrxonoxSky.material (modified) (1 diff)
• materials/planets.material (added)

data/trunk/AUTHORS

@@ -32 +32 @@
 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+

data/trunk/gui/looknfeels/OrxonoxLook.looknfeel

@@ -2455 +2455 @@
                 <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" />

data/trunk/materials/OrxonoxSky.material

@@ -47 +47 @@
                         {
                                 cubic_texture starbox.jpg separateUV
+                                tex_address_mode clamp
+                        }
+                }
+        }
+}
+
+material Orxonox/Starbox2
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        depth_write off
+
+                        texture_unit
+                        {
+                                cubic_texture SkyboxFile.png separateUV
                                 tex_address_mode clamp
                         }