Changeset 6417 for code/trunk/data/overlays

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/overlays/OrxonoxLoading.overlay (modified) (1 diff)
• data/overlays/debug.oxo (modified) (1 diff)
• data/overlays/stats.oxo (modified) (5 diffs)

code/trunk/data/overlays/OrxonoxLoading.overlay

@@ -11 +11 @@
       material Orxonox/LoadingScreenSample
    }
-} 
+}

code/trunk/data/overlays/debug.oxo

@@ -35 +35 @@
    textsize = 0.03
   />
-  
+
 </OverlayGroup>
 

code/trunk/data/overlays/stats.oxo

@@ -6 +6 @@
        name      = "Title"
        position  = "0.79, 0.19"
-       pickpoint = "1, 1"       
+       pickpoint = "1, 1"
        font      = "Monofur"
        caption   = "Scoreboard"
@@ -12 +12 @@
        textsize  = 0.04
       /-->
-      
+
       <OverlayText
        name      = "descr1"
@@ -25 +25 @@
        name      = "descr2"
        position  = "0.6, 0.20"
-       pickpoint = "0, 1"       
+       pickpoint = "0, 1"
        font      = "Monofur"
        caption   = "score"
@@ -34 +34 @@
        name      = "descr3"
        position  = "0.8, 0.20"
-       pickpoint = "0, 1"       
+       pickpoint = "0, 1"
        font      = "Monofur"
        caption   = "deaths"
@@ -40 +40 @@
        textsize  = 0.04
       />
-      
+
       <!--Stats
        name     = "Statistics"