Changeset 9348 for code/trunk/data/overlays

Timestamp:

Aug 30, 2012, 11:08:17 PM (12 years ago)

Author:

landauf

Message:

merged branch presentation2012merge back to trunk

Location:

code/trunk

Files:

• . (modified) (2 props)
• data/overlays/dynamicMatchHUD.oxo (modified) (1 diff)
• data/overlays/lastManStandingHUD.oxo (modified) (2 diffs)
• data/overlays/lastTeamStandingHUD.oxo (modified) (2 diffs)
• data/overlays/tetrisHUD.oxo (copied) (copied from code/branches/presentation2012merge/data/overlays/tetrisHUD.oxo)
• data/overlays/towerdefenseHUD.oxo (copied) (copied from code/branches/presentation2012merge/data/overlays/towerdefenseHUD.oxo)
• data/overlays/underAttackHUD.oxo (deleted)

code/trunk

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies

code/trunk/data/overlays/dynamicMatchHUD.oxo

@@ -2 +2 @@
   <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
    
+    <!--OverlayText
+     position  = "0.02, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Target:"
+    />
+
+    <OverlayText
+     position  = "0.02, 0.055"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Score:"
+    /-->
+
+
  <GametypeStaticMessage
    name     = "staticmessage"

code/trunk/data/overlays/lastManStandingHUD.oxo

@@ -1 +1 @@
 <Template name="LastmanstandingHUD">
-  <OverlayGroup name="DynamicmatcHUD" scale = "1, 1">
-   
- <!--GametypeStaticMessage
-   name     = "staticmessage"
-   position = "0.5, 0.01"
-   font     = "VeraMono"
-   caption  = ""
-   textsize = 0.033
-   colour   = "1.0, 1.0, 0.5, 1.0"
-   align    = "center"
-  /-->
-
-<GametypeFadingMessage
-     name     = "fadingmessage"
-     position = "0.5, 0.01"
-     font     = "VeraMono"
-     textsize = 0.04
-     colour   = "1.0, 1.0, 0.5, 1.0"
-     align    = "center"
-    />
-
-    <OverlayText
-     position  = "0.02, 0.02"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-     caption   = "Lives:   "
-    />
-
+  <OverlayGroup name="LastmanstandingHUD" scale = "1, 1">
     <LastManStandingInfos
      position  = "0.14, 0.02"
@@ -41 +11 @@
      showlives     = true
      showplayers     = false
+    />
+    <OverlayText
+     position  = "0.02, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
+     caption   = "Lives:   "
     />
 

code/trunk/data/overlays/lastTeamStandingHUD.oxo

@@ -1 +1 @@
 <Template name="lastTeamStandingHUD">
   <OverlayGroup name="lastTeamStandingHUD" scale = "1, 1">
+    <LastTeamStandingInfos
+     position  = "0.14, 0.02"
+     pickpoint = "0.0, 0.0"
+     font      = "ShareTechMono"
+     textsize  = 0.04
+     colour    = "1.0, 1.0, 1.0, 1.0"
+     align     = "left"
 
-<GametypeFadingMessage
-     name     = "fadingmessage"
-     position = "0.5, 0.01"
-     font     = "VeraMono"
-     textsize = 0.04
-     colour   = "1.0, 1.0, 0.5, 1.0"
-     align    = "center"
+     showlives     = true
+     showteams     = false
     />
 
@@ -19 +21 @@
      align     = "left"
      caption   = "Lives:   "
-    />
-
-    <LastTeamStandingInfos
-     position  = "0.14, 0.02"
-     pickpoint = "0.0, 0.0"
-     font      = "ShareTechMono"
-     textsize  = 0.04
-     colour    = "1.0, 1.0, 1.0, 1.0"
-     align     = "left"
-
-     showlives     = true
-     showteams     = false
     />
 

@@ +1 @@
+.project
 build
 codeblocks
+dependencies
 vs
-dependencies