Changeset 11783 for code/trunk/data/overlays

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• data/overlays/Asteroids2DHUD.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/Asteroids2DHUD.oxo)
• data/overlays/FlappyOrxHUD.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/FlappyOrxHUD.oxo)
• data/overlays/HUDTemplates3.oxo (modified) (2 diffs)
• data/overlays/HUDTemplatesFPS.oxo (modified) (1 diff)
• data/overlays/SOBHUD.oxo (modified) (1 prop)
• data/overlays/StoryModeHUD.oxo (modified) (1 diff, 1 prop)
• data/overlays/StoryModeHUD2.oxo (copied) (copied from code/branches/Presentation_HS17_merge/data/overlays/StoryModeHUD2.oxo)

code/trunk/data/overlays/HUDTemplates3.oxo

@@ -47 +47 @@
 <Template name="spaceshiphud">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
+
 
     <HUDHealthBar
@@ -217 +217 @@
 
     <GUIOverlay
-      name = "Dialogue"
-      guiname = "Dialogue"
+      name = "Dialog"
+      guiname = "Dialog"
       visible = "false"
     />

code/trunk/data/overlays/HUDTemplatesFPS.oxo

@@ -1 +1 @@
 <Template name="fpshud">
   <OverlayGroup name = "fpshud" scale = "1, 1">
-    <Map />
-
     <HUDHealthBar
      name              = "HealthBar1"

code/trunk/data/overlays/StoryModeHUD.oxo

@@ -2 +2 @@
 <Template name="StoryModeMap">
   <OverlayGroup name = "spaceshiphud" scale = "1, 1">
-    <Map />
-
 
      <GUIOverlay